From c370cdc53d45a3e033ffcff0609714a1db968ddf Mon Sep 17 00:00:00 2001 From: dleffler Date: Tue, 21 Nov 2017 19:11:38 -0500 Subject: [PATCH] fix sorting on several manage tables such as show expired news, etc...we weren't account for those passed params --- .../modules/banners/controllers/bannerController.php | 3 ++- .../modules/company/controllers/companyController.php | 1 + .../ecommerce/controllers/ecomconfigController.php | 3 ++- .../ecommerce/controllers/eventregistrationController.php | 3 ++- .../modules/ecommerce/controllers/orderController.php | 8 ++++---- framework/modules/faq/controllers/faqController.php | 3 ++- framework/modules/motd/controllers/motdController.php | 3 ++- framework/modules/news/controllers/newsController.php | 3 ++- 8 files changed, 17 insertions(+), 10 deletions(-) diff --git a/framework/modules/banners/controllers/bannerController.php b/framework/modules/banners/controllers/bannerController.php index 66efeb8b94..118ab1d8e9 100755 --- a/framework/modules/banners/controllers/bannerController.php +++ b/framework/modules/banners/controllers/bannerController.php @@ -100,7 +100,8 @@ public function manage() { $page = new expPaginator(array( 'model'=>'banner', 'sql'=>$sql, - 'order'=>'title', + 'order' => (isset($this->params['order']) ? $this->params['order'] : 'title'), + 'dir' => (isset($this->params['dir']) ? $this->params['dir'] : ''), 'page'=>(isset($this->params['page']) ? $this->params['page'] : 1), 'controller'=>$this->params['controller'], 'action'=>$this->params['action'], diff --git a/framework/modules/company/controllers/companyController.php b/framework/modules/company/controllers/companyController.php index b4c761dd0a..49bd043109 100755 --- a/framework/modules/company/controllers/companyController.php +++ b/framework/modules/company/controllers/companyController.php @@ -48,6 +48,7 @@ function showall() { 'where'=>1, 'limit'=>(isset($this->params['limit']) && $this->config['limit'] != '') ? $this->params['limit'] : 10, 'order'=>isset($this->params['order']) ? $this->params['order'] : 'rank', + 'dir' => (isset($this->params['dir']) ? $this->params['dir'] : ''), 'page'=>(isset($this->params['page']) ? $this->params['page'] : 1), 'controller'=>$this->baseclassname, 'action'=>$this->params['action'], diff --git a/framework/modules/ecommerce/controllers/ecomconfigController.php b/framework/modules/ecommerce/controllers/ecomconfigController.php index d57a024b84..1c45f3695c 100755 --- a/framework/modules/ecommerce/controllers/ecomconfigController.php +++ b/framework/modules/ecommerce/controllers/ecomconfigController.php @@ -149,7 +149,8 @@ public function manage_discounts() { 'model'=>'discounts', 'sql'=>'SELECT * FROM '.DB_TABLE_PREFIX.'_discounts', 'limit'=> 10, - 'order'=>isset($this->params['order']) ? $this->params['order'] : null, + 'order' => (isset($this->params['order']) ? $this->params['order'] : null), + 'dir' => (isset($this->params['dir']) ? $this->params['dir'] : ''), 'page'=>(isset($this->params['page']) ? $this->params['page'] : 1), 'controller' => $this->params['controller'], 'action' => $this->params['action'], diff --git a/framework/modules/ecommerce/controllers/eventregistrationController.php b/framework/modules/ecommerce/controllers/eventregistrationController.php index 0b1d0d528a..aca4d53d25 100755 --- a/framework/modules/ecommerce/controllers/eventregistrationController.php +++ b/framework/modules/ecommerce/controllers/eventregistrationController.php @@ -400,7 +400,8 @@ function manage() { $page = new expPaginator(array( 'records'=>$pass_events, 'limit'=>$limit, - 'order'=>"eventdate ASC", + 'order' => (isset($this->params['order']) ? $this->params['order'] : 'eventdate'), + 'dir' => (isset($this->params['dir']) ? $this->params['dir'] : 'ASC'), 'page'=>(isset($this->params['page']) ? $this->params['page'] : 1), 'controller'=>$this->params['controller'], 'action'=>$this->params['action'], diff --git a/framework/modules/ecommerce/controllers/orderController.php b/framework/modules/ecommerce/controllers/orderController.php index 2464981e7f..dc1011dfa9 100755 --- a/framework/modules/ecommerce/controllers/orderController.php +++ b/framework/modules/ecommerce/controllers/orderController.php @@ -130,8 +130,8 @@ function showall() { $page = new expPaginator(array( //'model'=>'order', 'sql' => $sql, - 'order' => 'purchased', - 'dir' => 'DESC', + 'order' => (isset($this->params['order']) ? $this->params['order'] : 'purchased'), + 'dir' => (isset($this->params['dir']) ? $this->params['dir'] : 'DESC'), 'limit' => $limit, 'page' => (isset($this->params['page']) ? $this->params['page'] : 1), 'controller'=> $this->params['controller'], @@ -908,8 +908,8 @@ function ordersbyuser() { 'model' => 'order', //FIXME we should also be getting the order status name 'where' => 'purchased > 0 AND user_id=' . $user->id, 'limit' => 10, - 'order' => 'purchased', - 'dir' => 'DESC', + 'order' => (isset($this->params['order']) ? $this->params['order'] : 'purchased'), + 'dir' => (isset($this->params['dir']) ? $this->params['dir'] : 'DESC'), 'page' => (isset($this->params['page']) ? $this->params['page'] : 1), 'controller'=> $this->params['controller'], 'action' => $this->params['action'], diff --git a/framework/modules/faq/controllers/faqController.php b/framework/modules/faq/controllers/faqController.php index 14fa3db5bf..53f91b4c7a 100755 --- a/framework/modules/faq/controllers/faqController.php +++ b/framework/modules/faq/controllers/faqController.php @@ -108,7 +108,8 @@ public function manage() { // 'where' => "location_data='".serialize($this->loc)."'", 'where' => $this->aggregateWhereClause(), 'limit'=>25, - 'order'=>'rank', + 'order' => (isset($this->params['order']) ? $this->params['order'] : 'rank'), + 'dir' => (isset($this->params['dir']) ? $this->params['dir'] : ''), 'page'=>(isset($this->params['page']) ? $this->params['page'] : 1), 'controller'=>$this->baseclassname, 'action'=>$this->params['action'], diff --git a/framework/modules/motd/controllers/motdController.php b/framework/modules/motd/controllers/motdController.php index b0240135c7..14ed3626e7 100755 --- a/framework/modules/motd/controllers/motdController.php +++ b/framework/modules/motd/controllers/motdController.php @@ -68,7 +68,8 @@ function showall() { 'model'=>'motd', 'where'=>$this->aggregateWhereClause(), 'limit'=>(isset($this->config['limit']) && $this->config['limit'] != '') ? $this->config['limit'] : 10, - 'order'=>'month,day', + 'order' => (isset($this->params['order']) ? $this->params['order'] : 'month,day'), + 'dir' => (isset($this->params['dir']) ? $this->params['dir'] : ''), 'page'=>(isset($this->params['page']) ? $this->params['page'] : 1), 'controller'=>$this->baseclassname, 'action'=>$this->params['action'], diff --git a/framework/modules/news/controllers/newsController.php b/framework/modules/news/controllers/newsController.php index abeec071b2..7ad9d79a55 100755 --- a/framework/modules/news/controllers/newsController.php +++ b/framework/modules/news/controllers/newsController.php @@ -189,7 +189,8 @@ public function showUnpublished() { 'model'=>'news', 'where'=>$where, 'limit'=>25, - 'order'=>'unpublish', + 'order' => isset($this->params['order']) ? $this->params['order'] : 'unpublish', + 'dir' => isset($this->params['dir']) ? $this->params['dir'] : 'DESC', 'page'=>(isset($this->params['page']) ? $this->params['page'] : 1), 'controller'=>$this->baseclassname, 'action'=>$this->params['action'],