From 3e559044b22dd847ec0846244f2bd6bcd34b8530 Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Thu, 23 Jun 2022 18:41:13 -0700
Subject: [PATCH] Changed method and scope names

Signed-off-by: snipe <snipe@snipe.net>
---
 app/Http/Controllers/Api/UsersController.php | 2 +-
 app/Http/Transformers/UsersTransformer.php   | 6 +++---
 app/Models/User.php                          | 4 ++--
 resources/views/users/view.blade.php         | 8 ++++----
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/app/Http/Controllers/Api/UsersController.php b/app/Http/Controllers/Api/UsersController.php
index adad3bca21..00847f6e82 100644
--- a/app/Http/Controllers/Api/UsersController.php
+++ b/app/Http/Controllers/Api/UsersController.php
@@ -188,7 +188,7 @@ class UsersController extends Controller
                 $users = $users->OrderDepartment($order);
                 break;
             case 'created_by':
-                $users = $users->OrderAdmin($order);
+                $users = $users->CreatedBy($order);
                 break;
             case 'company':
                 $users = $users->OrderCompany($order);
diff --git a/app/Http/Transformers/UsersTransformer.php b/app/Http/Transformers/UsersTransformer.php
index ecf6e1a125..9a498a325e 100644
--- a/app/Http/Transformers/UsersTransformer.php
+++ b/app/Http/Transformers/UsersTransformer.php
@@ -63,9 +63,9 @@ class UsersTransformer
                 'accessories_count' => (int) $user->accessories_count,
                 'consumables_count' => (int) $user->consumables_count,
                 'company' => ($user->company) ? ['id' => (int) $user->company->id, 'name'=> e($user->company->name)] : null,
-                'created_by' => ($user->adminuser) ? [
-                    'id' => (int) $user->adminuser->id,
-                    'name'=> e($user->adminuser->present()->fullName),
+                'created_by' => ($user->createdBy) ? [
+                    'id' => (int) $user->createdBy->id,
+                    'name'=> e($user->createdBy->present()->fullName),
                 ] : null,
                 'created_at' => Helper::getFormattedDateObject($user->created_at, 'datetime'),
                 'updated_at' => Helper::getFormattedDateObject($user->updated_at, 'datetime'),
diff --git a/app/Models/User.php b/app/Models/User.php
index 0abca08320..2153194bf8 100755
--- a/app/Models/User.php
+++ b/app/Models/User.php
@@ -568,7 +568,7 @@ class User extends SnipeModel implements AuthenticatableContract, AuthorizableCo
      * @since [v1.0]
      * @return \Illuminate\Database\Eloquent\Relations\Relation
      */
-    public function adminuser()
+    public function createdBy()
     {
         return $this->belongsTo(\App\Models\User::class, 'created_by')->withTrashed();
     }
@@ -705,7 +705,7 @@ class User extends SnipeModel implements AuthenticatableContract, AuthorizableCo
      *
      * @return \Illuminate\Database\Query\Builder          Modified query builder
      */
-    public function scopeOrderAdmin($query, $order)
+    public function scopeCreatedBy($query, $order)
     {
         // Left join here, or it will only return results with parents
         return $query->leftJoin('users as admin_user', 'users.created_by', '=', 'admin_user.id')
diff --git a/resources/views/users/view.blade.php b/resources/views/users/view.blade.php
index 7789120a7f..d28759b841 100755
--- a/resources/views/users/view.blade.php
+++ b/resources/views/users/view.blade.php
@@ -464,12 +464,12 @@
                       <div class="col-md-9">
                         {{ \App\Helpers\Helper::getFormattedDateObject($user->created_at, 'datetime')['formatted']}}
 
-                          @if ($user->adminuser)
+                          @if ($user->createdBy)
                               by
-                              @if ($user->adminuser->deleted_at=='')
-                                  <a href="{{ route('users.show', ['user' => $user->user_id]) }}">{{ $user->adminuser->present()->fullName }}</a>
+                              @if ($user->createdBy->deleted_at=='')
+                                  <a href="{{ route('users.show', ['user' => $user->user_id]) }}">{{ $user->createdBy->present()->fullName }}</a>
                               @else
-                                  <del>{{ $user->adminuser->present()->fullName }}</del>
+                                  <del>{{ $user->createdBy->present()->fullName }}</del>
                               @endif