Merge pull request #13940 from snipe/features/add_location_to_user_vi…

…ew_assets Added location to user view assets
snipe · Nov 23, 2023 · e3a8952 · e3a8952
2 parents 6409018 + ad6b286
commit e3a8952
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/resources/views/account/view-assets.blade.php b/resources/views/account/view-assets.blade.php
@@ -390,7 +390,6 @@
                           data-show-columns="true"
                           data-show-export="true"
                           data-show-footer="true"
-                          data-show-refresh="false"
                           data-sort-order="asc"
                           id="userAssets"
                           class="table table-striped snipe-table"
@@ -407,6 +406,7 @@ class="table table-striped snipe-table"
                       <th class="col-md-2" data-switchable="true" data-visible="true">{{ trans('general.name') }}</th>
                       <th class="col-md-2" data-switchable="true" data-visible="true">{{ trans('admin/hardware/table.asset_model') }}</th>
                       <th class="col-md-3" data-switchable="true" data-visible="true">{{ trans('admin/hardware/table.serial') }}</th>
+                      <th class="col-md-2" data-switchable="true" data-visible="false">{{ trans('admin/hardware/form.default_location') }}</th>
                       @can('self.view_purchase_cost')
                         <th class="col-md-6" data-footer-formatter="sumFormatter" data-fieldname="purchase_cost">{{ trans('general.purchase_cost') }}</th>
                       @endcan
@@ -444,7 +444,7 @@ class="table table-striped snipe-table"
                           @endif
                         </td>
                         <td>{{ $asset->serial }}</td>
-
+                        <td>{{ ($asset->defaultLoc) ? $asset->defaultLoc->name : '' }}</td>
                         @can('self.view_purchase_cost')
                         <td>
                           {!! Helper::formatCurrencyOutput($asset->purchase_cost) !!}