A free open source IT asset/license management system
Fixed HTML
snipe9a3e04653073
diff --git a/app/Presenters/UserPresenter.php b/app/Presenters/UserPresenter.phpindex 296fafe568..b02a6e4fcd 100644--- a/app/Presenters/UserPresenter.php+++ b/app/Presenters/UserPresenter.php@@ -60,18 +60,14 @@ class UserPresenter extends Presenter'title' => trans('admin/users/table.name'),'visible' => true,'formatter' => 'usersLinkFormatter',- ],-- [+ ], ['field' => 'first_name','searchable' => true,'sortable' => true,'title' => trans('general.first_name'),'visible' => false,'formatter' => 'usersLinkFormatter',- ],-- [+ ], ['field' => 'last_name','searchable' => true,'sortable' => true,@@ -85,7 +81,23 @@ class UserPresenter extends Presenter'sortable' => true,'switchable' => false,'title' => trans('admin/users/table.display_name'),+ 'visible' => false,+ ], [+ 'field' => 'username',+ 'searchable' => true,+ 'sortable' => true,+ 'switchable' => false,+ 'title' => trans('admin/users/table.username'),'visible' => true,+ 'formatter' => 'usernameRoleLinkFormatter',+ ],+ [+ 'field' => 'employee_num',+ 'searchable' => true,+ 'sortable' => true,+ 'switchable' => true,+ 'title' => trans('general.employee_number'),+ 'visible' => false,],['field' => 'jobtitle',@@ -129,7 +141,7 @@ class UserPresenter extends Presenter'sortable' => true,'switchable' => true,'title' => trans('admin/users/table.phone'),- 'visible' => true,+ 'visible' => false,'formatter' => 'phoneFormatter',],[@@ -190,24 +202,7 @@ class UserPresenter extends Presenter'title' => trans('general.zip'),'visible' => false,],- [- 'field' => 'username',- 'searchable' => true,- 'sortable' => true,- 'switchable' => false,- 'title' => trans('admin/users/table.username'),- 'visible' => true,- 'formatter' => 'usernameRoleLinkFormatter',- ],- [- 'field' => 'employee_num',- 'searchable' => true,- 'sortable' => true,- 'switchable' => true,- 'title' => trans('general.employee_number'),- 'visible' => false,- ],['field' => 'locale','searchable' => true,@@ -231,7 +226,7 @@ class UserPresenter extends Presenter'sortable' => true,'switchable' => true,'title' => trans('admin/users/general.department_manager'),- 'visible' => true,+ 'visible' => false,'formatter' => 'usersLinkObjFormatter',],[@@ -248,7 +243,7 @@ class UserPresenter extends Presenter'searchable' => true,'sortable' => true,'title' => trans('admin/users/table.manager'),- 'visible' => true,+ 'visible' => false,'formatter' => 'usersLinkObjFormatter',],[diff --git a/resources/views/locations/view.blade.php b/resources/views/locations/view.blade.phpindex f912e921a4..42d060809b 100644--- a/resources/views/locations/view.blade.php+++ b/resources/views/locations/view.blade.php@@ -366,7 +366,7 @@</table></div><!-- /.tab-pane -->- <div class="tab-pane fade" id="child_locations">+<div class="tab-pane" id="child_locations"><h2 class="box-title">{{ trans('general.child_locations') }}@@ -388,8 +388,20 @@}'></table></div><!-- /.tab-pane -->++ <div class="tab-pane fade" id="files">+ <h2 class="box-title">+ {{ trans('general.child_locations') }}+ </h2>++ <div class="row">+ <div class="col-md-12">+ <x-filestable object_type="locations" :object="$location" />+ </div> <!-- /.col-md-12 -->+ </div> <!-- /.row --></div>+<div class="tab-pane" id="accessories_assigned"><h2 class="box-title" style="float:left">{{ trans('general.accessories_assigned') }}