Merge pull request #68 from AlexanderBlanchardAC/new_features_for_sum…

…mon_24.06.00 New features for summon 24.06.00
PTFS-Europe · Jun 4, 2024 · e6ccb1b · e6ccb1b
2 parents 10c3c4d + 9fea3cb
commit e6ccb1b
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 9 deletions.
diff --git a/code/web/sys/DBMaintenance/version_updates/24.06.00.php b/code/web/sys/DBMaintenance/version_updates/24.06.00.php
@@ -81,14 +81,6 @@ function getUpdates24_06_00(): array {
 
 		//other
 
-		//alexander - PTFS Europe
-		'explore_more_section_control' => [
-			'title' => 'Explore More Section Control',
-			'description' => 'Allow control over whether the Explore More Section is displayed',
-			'sql' => [
-				"ALTER TABLE layout_settings ADD COLUMN showExploreMoreOptions TINYINT DEFAULT '1'",
-			]
-		],//control_whether_the_explore_more_box_is_displayed
 
 
 	];

diff --git a/code/web/sys/SearchObject/SummonSearcher.php b/code/web/sys/SearchObject/SummonSearcher.php
@@ -517,10 +517,12 @@ public function getLimitList() {
 
 				foreach($limitOption['counts'] as $value){
 					if ($value['value'] == 'true') {
+						$isApplied = isset($this->limiters[$limitId]) && $this->limiters[$limitId] == 'y' ? 1 : 0;
+
 						$availableLimits[$limitId] = [
 							'display' => $displayName,
 							'value' => $limitId,
-							'isApplied' => ($this->limiters[$limitId]) == 'y' ? 1 : 0,
+							'isApplied' => $isApplied,
 							'url' => $this->renderLinkWithLimiter($limitId),
 							'removalUrl' => $this->renderLinkWithoutLimiter($limitId),
 						];