lunax/snipe_it
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity Actions

Fixes #3888 - broken preview of existing assets

Browse source
This commit is contained in:
snipe 2017-08-26 15:21:10 -07:00
parent abc3dea8ac
commit fba3949530
1 changed files with 29 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

53
resources/views/hardware/checkout.blade.php
View file

@ -292,45 +292,50 @@
}); });
}); });
</script>
<script>
$(function() { $(function() {
$('#assigned_to').on("change",function () { $('#assigned_user').on("change",function () {
// console.warn("Model Id has changed!"); var userid = $('#assigned_user option:selected').val();
var userid=$('#assigned_to').val();
if(userid=='') { if(userid=='') {
console.warn('no user selected'); console.warn('no user selected');
$('#current_assets_box').fadeOut(); $('#current_assets_box').fadeOut();
$('#current_assets_content').html(""); $('#current_assets_content').html("");
} else { } else {
$.get("{{url('/') }}/api/users/"+userid+"/assets",{_token: "{{ csrf_token() }}"},function (data) { $.ajax({
// console.warn("Ajax call came back okay for user " + userid + "! " + data.length + " Data is: "+data); type: 'GET',
if (data.length > 0) { url: '{{url('/') }}/api/v1/users/' + userid + '/assets',
$('#current_assets_box').fadeIn(); headers: {
"X-Requested-With": 'XMLHttpRequest',
"X-CSRF-TOKEN": $('meta[name="csrf-token"]').attr('content')
},
var table_html = '<div class="row"><div class="col-md-12"><table class="table table-striped"><thead><tr><td>{{ trans('admin/hardware/form.name') }}</td><td>{{ trans('admin/hardware/form.tag') }}</td></tr></thead><tbody>'; dataType: 'json',
success: function (data) {
$('#current_assets_box').fadeIn();
$('#current_assets_content').append(''); var table_html = '<div class="row"><div class="col-md-12"><table class="table table-striped"><thead><tr><td>{{ trans('admin/hardware/form.name') }}</td><td>{{ trans('admin/hardware/form.tag') }}</td></tr></thead><tbody>';
for (var i in data) { $('#current_assets_content').append('');
var asset = data[i];
table_html += "<tr><td class=\"col-md-8\"><a href=\"{{ url('/') }}/hardware/" + asset.id + "/view\">" + asset.name;
if (asset.model.name!='') {
table_html += " (" + asset.model.name + ")";
for (var i in data) {
var asset = data[i];
table_html += '<tr><td class="col-md-8"><a href="{{ url('/') }}/hardware/' + asset.id + '">' + asset.name;
if (asset.model.name!='') {
table_html += " (" + asset.model.name + ")";
}
table_html += "</a></td><td class=\"col-md-4\">" + asset.asset_tag + "</td></tr>";
} }
table_html += "</a></td><td class=\"col-md-4\">" + asset.asset_tag + "</td></tr>";
$('#current_assets_content').html(table_html + '</tbody></table></div></div>');
},
error: function (data) {
$('#current_assets_box').fadeOut();
} }
});
$('#current_assets_content').html(table_html + '</tbody></table></div></div>');
} else {
$('#current_assets_box').fadeOut();
}
});
} }
}); });
}); });