DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2025-02-02 08:21:09 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Fixes #3865 - employee number mislabeled in list output

Browse source
This commit is contained in:
snipe 2017-08-22 21:40:35 -07:00
parent a0cbca85bf
commit 06c5bce3c7
2 changed files with 4 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
app/Presenters/AssetPresenter.php
View file

@ -100,13 +100,12 @@ class AssetPresenter extends Presenter
"visible" => true, "visible" => true,
"formatter" => "usersLinkObjFormatter" "formatter" => "usersLinkObjFormatter"
], [ ], [
"field" => "assigned_to", "field" => "employee_number",
"searchable" => false, "searchable" => false,
"sortable" => false, "sortable" => false,
"title" => trans('admin/users/table.employee_num'), "title" => trans('admin/users/table.employee_num'),
"visible" => false, "visible" => false,
"formatter" => "employeeNumFormatter" "formatter" => "employeeNumFormatter"
],[ ],[
"field" => "location", "field" => "location",
"searchable" => true, "searchable" => true,

7
resources/views/partials/bootstrap-table.blade.php
View file

@ -322,10 +322,9 @@ $('.snipe-table').bootstrapTable({
} }
function employeeNumFormatter(value, row) { function employeeNumFormatter(value, row) {
if ((value) && (value.employee_number)) {
return '<a href="{{ url('/') }}/users/' + row.id + '"> ' + value.employee_number + '</a>'; if ((row.assigned_to) && ((row.assigned_to.employee_number))) {
} else { return '<a href="{{ url('/') }}/users/' + row.assigned_to.id + '"> ' + row.assigned_to.employee_number + '</a>';
return value;
} }
} }