From 537da0f77eb65d5b6bd877b1d8c6787755dad10f Mon Sep 17 00:00:00 2001
From: EnesSacid-Buker <73346401+EnesSacid-Buker@users.noreply.github.com>
Date: Tue, 20 Dec 2022 17:00:49 +0300
Subject: [PATCH] `scopeCollect` function in models updated

---
 app/Abstracts/Model.php  | 10 ++++++++++
 app/Models/Auth/User.php | 16 ++++++++++++++--
 2 files changed, 24 insertions(+), 2 deletions(-)

diff --git a/app/Abstracts/Model.php b/app/Abstracts/Model.php
index 9280c1155..0b045033a 100644
--- a/app/Abstracts/Model.php
+++ b/app/Abstracts/Model.php
@@ -102,12 +102,22 @@ abstract class Model extends Eloquent implements Ownable
     {
         $request = request();
 
+        /**
+         * Modules that use the sort parameter in CRUD operations cause an error,
+         * so this sort parameter set back to old value after the query is executed.
+         * 
+         * for Custom Fields module
+         */
+        $request_sort = $request->get('sort');
+
         $query->usingSearchString()->sortable($sort);
 
         if ($request->expectsJson() && $request->isNotApi()) {
             return $query->get();
         }
 
+        $request->merge(['sort' => $request_sort]);
+        $request->offsetUnset('direction');
         $limit = (int) $request->get('limit', setting('default.list_limit', '25'));
 
         return $query->paginate($limit);
diff --git a/app/Models/Auth/User.php b/app/Models/Auth/User.php
index c6bd702d1..16c3ec07d 100644
--- a/app/Models/Auth/User.php
+++ b/app/Models/Auth/User.php
@@ -190,11 +190,23 @@ class User extends Authenticatable implements HasLocalePreference
     public function scopeCollect($query, $sort = 'name')
     {
         $request = request();
-
         $search = $request->get('search');
+
+        /**
+         * Modules that use the sort parameter in CRUD operations cause an error,
+         * so this sort parameter set back to old value after the query is executed.
+         * 
+         * for Custom Fields module
+         */
+        $request_sort = $request->get('sort');
+
+        $query->usingSearchString($search)->sortable($sort);
+
+        $request->merge(['sort' => $request_sort]);
+        $request->offsetUnset('direction');
         $limit = (int) $request->get('limit', setting('default.list_limit', '25'));
 
-        return $query->usingSearchString($search)->sortable($sort)->paginate($limit);
+        return $query->paginate($limit);
     }
 
     /**