From 7214eca9a950337c645702baeb4891086ec82bfe Mon Sep 17 00:00:00 2001 From: Diatrex Date: Mon, 18 Nov 2019 17:59:18 +0300 Subject: [PATCH 1/4] #1 fix images not shown in openclassify --- addons/default/visiosoft/demodata-module | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/default/visiosoft/demodata-module b/addons/default/visiosoft/demodata-module index e87cf9caa..67f186905 160000 --- a/addons/default/visiosoft/demodata-module +++ b/addons/default/visiosoft/demodata-module @@ -1 +1 @@ -Subproject commit e87cf9caa2e9fc7ebb35e650bd8cb17a1655aac1 +Subproject commit 67f1869058f2a06a66d221a1795b5a2db49c2735 From abe87ea262895e469447225937920a23b252bfec Mon Sep 17 00:00:00 2001 From: Diatrex Date: Tue, 19 Nov 2019 17:09:18 +0300 Subject: [PATCH 2/4] Default country in listing #152 --- .../advs-module/resources/views/list/list.twig | 3 ++- .../src/Http/Controller/advsController.php | 9 ++++++++- .../base-theme/resources/js/filterLocation.js | 11 ++++++++++- 3 files changed, 20 insertions(+), 3 deletions(-) diff --git a/addons/default/visiosoft/advs-module/resources/views/list/list.twig b/addons/default/visiosoft/advs-module/resources/views/list/list.twig index 108a024c1..ca4a48cca 100644 --- a/addons/default/visiosoft/advs-module/resources/views/list/list.twig +++ b/addons/default/visiosoft/advs-module/resources/views/list/list.twig @@ -35,13 +35,14 @@ {% endblock %} - {% if entries('advs').isEnabled('favs') %} 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 ba76e11fc..370ae9f40 100644 --- a/addons/default/visiosoft/advs-module/src/Http/Controller/advsController.php +++ b/addons/default/visiosoft/advs-module/src/Http/Controller/advsController.php @@ -146,6 +146,13 @@ class AdvsController extends PublicController $subCats = array(); $param = $this->requestHttp->toArray(); + if (!isset($param['country'])) { + $param['country'] = setting_value('visiosoft.module.advs::default_country'); + $useDefault = 1; + } else { + $useDefault = 0; + } + $searchedCountry = $param['country']; $countries = $this->country_repository->viewAll(); @@ -213,7 +220,7 @@ class AdvsController extends PublicController } $compact = compact('advs', 'countries', 'mainCats', 'subCats', 'textfields', 'checkboxes', 'request', - 'user', 'userProfile', 'featured_advs', 'type', 'topfields', 'ranges', 'seenList'); + 'user', 'userProfile', 'featured_advs', 'type', 'topfields', 'ranges', 'seenList', 'searchedCountry', 'useDefault'); Cookie::queue(Cookie::make('last_search', $this->requestHttp->getRequestUri(), 84000)); diff --git a/addons/default/visiosoft/base-theme/resources/js/filterLocation.js b/addons/default/visiosoft/base-theme/resources/js/filterLocation.js index d0945e473..dd77002f6 100644 --- a/addons/default/visiosoft/base-theme/resources/js/filterLocation.js +++ b/addons/default/visiosoft/base-theme/resources/js/filterLocation.js @@ -25,6 +25,15 @@ FindLocations = (id, table, typeDb, divId, paramName = null) => { }); }; +// Set selected country in the select menu +if (useDefault) { + $('#cities').empty(); + var table = "cities"; + var typeDb = 'parent_country_id'; + var id = searchedCountry; + var divId = "#cities"; + FindLocations(id, table, typeDb, divId); +} setLocations = (response, id, table, typeDb, divId, paramName) => { @@ -40,7 +49,7 @@ setLocations = (response, id, table, typeDb, divId, paramName) => { //Set Selected Option if (paramName != null) { if (divId == "#cities") { - $('#countries').val(searchParams.get('country')); + $('#countries').val(searchedCountry); $('#countries').select2(); $('#cities').val(findParam("city[]")); } else { From cdd7f8185702153f4cca4ab937cb7a39b03aea24 Mon Sep 17 00:00:00 2001 From: Diatrex Date: Tue, 19 Nov 2019 17:26:31 +0300 Subject: [PATCH 3/4] Revert "#1 fix images not shown in openclassify" This reverts commit 7214eca9a950337c645702baeb4891086ec82bfe. # Conflicts: # addons/default/visiosoft/demodata-module --- addons/default/visiosoft/demodata-module | 1 - 1 file changed, 1 deletion(-) delete mode 160000 addons/default/visiosoft/demodata-module diff --git a/addons/default/visiosoft/demodata-module b/addons/default/visiosoft/demodata-module deleted file mode 160000 index 026073c7e..000000000 --- a/addons/default/visiosoft/demodata-module +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 026073c7ec0447fa505f0534df649f805d4c70f3 From e3cf2a68be4ee317c064f20297905398f76cb697 Mon Sep 17 00:00:00 2001 From: Diatrex Date: Tue, 19 Nov 2019 18:03:45 +0300 Subject: [PATCH 4/4] Default country in listing #152 #153 --- .../advs-module/resources/views/list/list.twig | 1 - .../src/Http/Controller/advsController.php | 13 +++++++++---- .../base-theme/resources/js/filterLocation.js | 2 +- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/addons/default/visiosoft/advs-module/resources/views/list/list.twig b/addons/default/visiosoft/advs-module/resources/views/list/list.twig index ca4a48cca..f7dc858c0 100644 --- a/addons/default/visiosoft/advs-module/resources/views/list/list.twig +++ b/addons/default/visiosoft/advs-module/resources/views/list/list.twig @@ -42,7 +42,6 @@ {% if entries('advs').isEnabled('favs') %} 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 370ae9f40..f5ed48863 100644 --- a/addons/default/visiosoft/advs-module/src/Http/Controller/advsController.php +++ b/addons/default/visiosoft/advs-module/src/Http/Controller/advsController.php @@ -147,10 +147,15 @@ class AdvsController extends PublicController $param = $this->requestHttp->toArray(); if (!isset($param['country'])) { - $param['country'] = setting_value('visiosoft.module.advs::default_country'); - $useDefault = 1; + if (is_null(Cookie::get('country'))) { + $param['country'] = setting_value('visiosoft.module.advs::default_country'); + } else { + $param['country'] = Cookie::get('country'); + } } else { - $useDefault = 0; + if ($param['country'] != setting_value('visiosoft.module.advs::default_country')) { + Cookie::queue(Cookie::make('country', $param['country'], 84000)); + } } $searchedCountry = $param['country']; @@ -220,7 +225,7 @@ class AdvsController extends PublicController } $compact = compact('advs', 'countries', 'mainCats', 'subCats', 'textfields', 'checkboxes', 'request', - 'user', 'userProfile', 'featured_advs', 'type', 'topfields', 'ranges', 'seenList', 'searchedCountry', 'useDefault'); + 'user', 'userProfile', 'featured_advs', 'type', 'topfields', 'ranges', 'seenList', 'searchedCountry'); Cookie::queue(Cookie::make('last_search', $this->requestHttp->getRequestUri(), 84000)); diff --git a/addons/default/visiosoft/base-theme/resources/js/filterLocation.js b/addons/default/visiosoft/base-theme/resources/js/filterLocation.js index dd77002f6..32bcb033b 100644 --- a/addons/default/visiosoft/base-theme/resources/js/filterLocation.js +++ b/addons/default/visiosoft/base-theme/resources/js/filterLocation.js @@ -26,7 +26,7 @@ FindLocations = (id, table, typeDb, divId, paramName = null) => { }; // Set selected country in the select menu -if (useDefault) { +if (searchParams.get('country') == null) { $('#cities').empty(); var table = "cities"; var typeDb = 'parent_country_id';