enhancement: introduced persistent filter support (LMS+ #620) - resto…

…re previously selected persistent filter
chilek · Sep 6, 2018 · 08b0b75 · 08b0b75
1 parent 6b7de7f
commit 08b0b75
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/index.php b/index.php
@@ -314,8 +314,14 @@
 				// persister filter apply
 				if (isset($_GET['persistent-filter']) && isset($_POST['name']) && $_POST['action'] == 'apply') {
 					$filter = $SESSION->getPersistentFilter($_POST['name']);
+					$filter['persistent_filter'] = $_POST['name'];
 					$SESSION->saveFilter($filter);
-				}
+				} else
+					$filter = $SESSION->getFilter();
+
+				// restore selected persistent filter info
+				if (isset($filter['persistent_filter']))
+					$SMARTY->assign('persistent_filter', $filter['persistent_filter']);
 			} else {
 				// persistent filter ajax management
 				if (isset($_GET['persistent-filter']) && isset($_POST['name']))

diff --git a/lib/SmartyPlugins/function.persistent_filter.php b/lib/SmartyPlugins/function.persistent_filter.php
@@ -27,10 +27,12 @@
 function smarty_function_persistent_filter($params, $template) {
 	$layout = $template->getTemplateVars('layout');
 	$persistent_filters = $template->getTemplateVars('persistent_filters');
+	$persistent_filter = $template->getTemplateVars('persistent_filter');
 
 	$filters = '';
 	foreach ($persistent_filters as $filter_name => $filter)
-		$filters .= '<option value="' . $filter_name . '">' . $filter_name . '</option >';
+		$filters .= '<option value="' . $filter_name . '"' . ($filter_name == $persistent_filter ? ' selected' : '')
+			. '>' . $filter_name . '</option >';
 
 	return '<form method="post" class="lms-ui-persistent-filter" action="?m=' . $layout['module'] . '&persistent-filter=1&api=1">
 		<input type="hidden" name="action" value="apply">