From c67317254d96ef26c21cea8dc78cb9f9cf0b993b Mon Sep 17 00:00:00 2001
From: Diatrex <diahshalabi@hotmail.com>
Date: Tue, 28 Apr 2020 17:36:25 +0300
Subject: [PATCH] #1302 Too long to load the listing page

---
 .../advs-module/resources/js/filter_modal.js     |  5 -----
 .../views/list/partials/filter-modal.twig        | 16 +++++++++-------
 .../src/AdvsModuleServiceProvider.php            |  9 ---------
 .../src/Http/Controller/advsController.php       |  3 ++-
 4 files changed, 11 insertions(+), 22 deletions(-)

diff --git a/addons/default/visiosoft/advs-module/resources/js/filter_modal.js b/addons/default/visiosoft/advs-module/resources/js/filter_modal.js
index 687492b66..dfecaadf1 100644
--- a/addons/default/visiosoft/advs-module/resources/js/filter_modal.js
+++ b/addons/default/visiosoft/advs-module/resources/js/filter_modal.js
@@ -7,7 +7,6 @@ $('.edit-category-filter-modal').on('click', function () {
     $('#categoryModal').modal('toggle');
 })
 
-
 function crud(params, url, type, callback) {
     $.ajax({
         type: type,
@@ -143,7 +142,3 @@ $('.set_category').on('click', function () {
     $('#filterModal').find('form').attr("action", '/advs/list');
     $('#filterModal').modal('toggle');
 })
-
-
-
-
diff --git a/addons/default/visiosoft/advs-module/resources/views/list/partials/filter-modal.twig b/addons/default/visiosoft/advs-module/resources/views/list/partials/filter-modal.twig
index 95a13068e..5cc13770d 100644
--- a/addons/default/visiosoft/advs-module/resources/views/list/partials/filter-modal.twig
+++ b/addons/default/visiosoft/advs-module/resources/views/list/partials/filter-modal.twig
@@ -63,11 +63,13 @@
         </div>
     </div>
 </div>
-<script>
-    var key = 1;
+{% if not allCats %}
+    <script>
+        var key = 1;
 
-    $.each({{ mainCats|json_encode|raw }}, function (index, value) {
-        categories['cat' + key] = value.id;
-        key++;
-    });
-</script>
+        $.each({{ mainCats|json_encode|raw }}, function (index, value) {
+            categories['cat' + key] = value.id;
+            key++;
+        });
+    </script>
+{% endif %}
diff --git a/addons/default/visiosoft/advs-module/src/AdvsModuleServiceProvider.php b/addons/default/visiosoft/advs-module/src/AdvsModuleServiceProvider.php
index c122744a6..133138baa 100644
--- a/addons/default/visiosoft/advs-module/src/AdvsModuleServiceProvider.php
+++ b/addons/default/visiosoft/advs-module/src/AdvsModuleServiceProvider.php
@@ -60,15 +60,6 @@ class AdvsModuleServiceProvider extends AddonServiceProvider
      * @type array|null
      */
     protected $routes = [
-        // 'admin/advs/cf_values'           => 'Visiosoft\AdvsModule\Http\Controller\Admin\CfValuesController@index',
-        // 'admin/advs/cf_values/create'    => 'Visiosoft\AdvsModule\Http\Controller\Admin\CfValuesController@create',
-        // 'admin/advs/cf_values/edit/{id}' => 'Visiosoft\AdvsModule\Http\Controller\Admin\CfValuesController@edit',
-        // 'admin/advs/custom_field_advs'           => 'Visiosoft\AdvsModule\Http\Controller\Admin\CustomFieldAdvsController@index',
-        // 'admin/advs/custom_field_advs/create'    => 'Visiosoft\AdvsModule\Http\Controller\Admin\CustomFieldAdvsController@create',
-        // 'admin/advs/custom_field_advs/edit/{id}' => 'Visiosoft\AdvsModule\Http\Controller\Admin\CustomFieldAdvsController@edit',
-        // 'admin/advs/custom_fields'           => 'Visiosoft\AdvsModule\Http\Controller\Admin\CustomFieldsController@index',
-        // 'admin/advs/custom_fields/create'    => 'Visiosoft\AdvsModule\Http\Controller\Admin\CustomFieldsController@create',
-        // 'admin/advs/custom_fields/edit/{id}' => 'Visiosoft\AdvsModule\Http\Controller\Admin\CustomFieldsController@edit',
         'admin/advs/advs' => 'Visiosoft\AdvsModule\Http\Controller\Admin\AdvsController@index',
         'admin/advs/advs/create' => 'Visiosoft\AdvsModule\Http\Controller\Admin\AdvsController@create',
         'admin/advs/advs/edit/{id}' => 'Visiosoft\AdvsModule\Http\Controller\Admin\AdvsController@edit',
diff --git a/addons/default/visiosoft/advs-module/src/Http/Controller/advsController.php b/addons/default/visiosoft/advs-module/src/Http/Controller/advsController.php
index 85e50726e..6c399b939 100644
--- a/addons/default/visiosoft/advs-module/src/Http/Controller/advsController.php
+++ b/addons/default/visiosoft/advs-module/src/Http/Controller/advsController.php
@@ -257,6 +257,7 @@ class AdvsController extends PublicController
             $subCats = $this->category_repository->getSubCatById($categoryId->id);
         } else {
             $mainCats = $this->category_repository->mainCats();
+            $allCats = true;
         }
 
         if ($isActiveCustomFields) {
@@ -279,7 +280,7 @@ class AdvsController extends PublicController
 
         $compact = compact('advs', 'countries', 'mainCats', 'subCats', 'checkboxes', 'request', 'param',
             'user', 'featured_advs', 'viewType', 'topfields', 'selectRange', 'selectImage', 'ranges', 'seenList',
-            'searchedCountry', 'radio', 'categoryId', 'cityId');
+            'searchedCountry', 'radio', 'categoryId', 'cityId', 'allCats');
 
         return $this->viewTypeBasedRedirect($viewType, $compact);
     }