From f58e00c41b2683ffe9b220be50709da7ba7d06bb Mon Sep 17 00:00:00 2001 From: Cameron Date: Mon, 8 May 2017 18:47:51 -0700 Subject: [PATCH] Admin-ui: Auto-display sort button when sortField is not empty and 'sort' parm is not set. --- e107_handlers/admin_ui.php | 1 + e107_handlers/form_handler.php | 9 ++++++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/e107_handlers/admin_ui.php b/e107_handlers/admin_ui.php index 5d28eabfc..f78f19308 100644 --- a/e107_handlers/admin_ui.php +++ b/e107_handlers/admin_ui.php @@ -7256,6 +7256,7 @@ class e_admin_form_ui extends e_form */ public function getController() { + return $this->_controller; } } diff --git a/e107_handlers/form_handler.php b/e107_handlers/form_handler.php index b877690e3..f2068d41b 100644 --- a/e107_handlers/form_handler.php +++ b/e107_handlers/form_handler.php @@ -4129,9 +4129,16 @@ class e_form } */ + $sf = $this->getController()->getSortField(); + + if(!isset($parms['sort']) && !empty($sf)) + { + $parms['sort'] = true; + } + $value = "
"; - if(!empty($parms['sort']) && empty($attributes['grid']))//FIXME use a global variable such as $fieldpref + if(!empty($parms['sort']) && empty($attributes['grid'])) { $mode = preg_replace('/[^\w]/', '', vartrue($_GET['mode'], '')); $from = intval(vartrue($_GET['from'],0));