From 35b0e80fee568c09eb6ddc6d7c75bb2d25d7e442 Mon Sep 17 00:00:00 2001 From: Diatrex Date: Mon, 26 Oct 2020 17:13:52 +0300 Subject: [PATCH] #2386 admin advs list - user select2 make it ajax --- .../default/visiosoft/advs-module/resources/css/custom.css | 4 ++++ .../advs-module/src/Http/Controller/Admin/AdvsController.php | 5 ----- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/addons/default/visiosoft/advs-module/resources/css/custom.css b/addons/default/visiosoft/advs-module/resources/css/custom.css index 8b202042d..54242c139 100644 --- a/addons/default/visiosoft/advs-module/resources/css/custom.css +++ b/addons/default/visiosoft/advs-module/resources/css/custom.css @@ -40,4 +40,8 @@ .select2-container--default .select2-selection--single .select2-selection__arrow { top: unset; +} + +select[name=filter_User] + .select2 { + min-width: 20rem; } \ No newline at end of file diff --git a/addons/default/visiosoft/advs-module/src/Http/Controller/Admin/AdvsController.php b/addons/default/visiosoft/advs-module/src/Http/Controller/Admin/AdvsController.php index 2321df840..6a00e9400 100644 --- a/addons/default/visiosoft/advs-module/src/Http/Controller/Admin/AdvsController.php +++ b/addons/default/visiosoft/advs-module/src/Http/Controller/Admin/AdvsController.php @@ -167,10 +167,6 @@ class AdvsController extends AdminController $cities = $cityModel->all()->pluck('name', 'id')->all(); - $users = $userModel->newQuery() - ->select(DB::raw("CONCAT_WS('', first_name, ' ', last_name, ' (', gsm_phone, ' || ', email, ')') AS display_name"), 'id') - ->pluck('display_name', 'id') - ->toArray(); $categories = $categoryModel::query()->where('parent_category_id', null) ->leftJoin('cats_category_translations', 'cats_category.id', '=', 'cats_category_translations.entry_id') ->where('locale', config('app.locale')) @@ -194,7 +190,6 @@ class AdvsController extends AdminController 'exact' => true, 'filter' => 'select', 'query' => UserFilterQuery::class, - 'options' => $users, ], 'status' => [ 'filter' => 'select',