Merge pull request #15653 from snipe/15651_admin_user_on_maintenances

Fixed #15651 - admin user now displaying on maintenances page
snipe · Oct 11, 2024 · 12bda8f · 12bda8f
2 parents 8aa298f + b054017
commit 12bda8f
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 8 deletions.
diff --git a/app/Http/Transformers/AssetMaintenancesTransformer.php b/app/Http/Transformers/AssetMaintenancesTransformer.php
@@ -66,7 +66,7 @@ public function transformAssetMaintenance(AssetMaintenance $assetmaintenance)
             'completion_date'     => Helper::getFormattedDateObject($assetmaintenance->completion_date, 'date'),
             'user_id'    => ($assetmaintenance->adminuser) ? [
                 'id' => $assetmaintenance->adminuser->id,
-                'name'=> e($assetmaintenance->admin->getFullNameAttribute())
+                'name'=> e($assetmaintenance->adminuser->present()->fullName())
             ] : null, // legacy to not change the shape of the API
             'created_by' => ($assetmaintenance->adminuser) ? [
                 'id' => (int) $assetmaintenance->adminuser->id,

diff --git a/app/Models/AssetMaintenance.php b/app/Models/AssetMaintenance.php
@@ -176,7 +176,7 @@ public function asset()
      */
     public function adminuser()
     {
-        return $this->belongsTo(\App\Models\User::class, 'user_id')
+        return $this->belongsTo(\App\Models\User::class, 'created_by')
             ->withTrashed();
     }
 

diff --git a/app/Presenters/AssetMaintenancesPresenter.php b/app/Presenters/AssetMaintenancesPresenter.php
@@ -116,12 +116,6 @@ public static function dataTableLayout()
                 'sortable' => true,
                 'title' => trans('admin/asset_maintenances/form.cost'),
                 'class' => 'text-right',
-            ], [
-                'field' => 'user_id',
-                'searchable' => true,
-                'sortable' => true,
-                'title' => trans('general.admin'),
-                'formatter' => 'usersLinkObjFormatter',
             ], [
                 'field' => 'created_by',
                 'searchable' => false,