Skip to content

Commit

Permalink
fix sorting on several manage tables such as show expired news, etc..…
Browse files Browse the repository at this point in the history 
….we weren't account for those passed params
  • Loading branch information
@dleffler
dleffler committed Nov 22, 2017
1 parent 6cd60b6 commit c370cdc
Show file tree
Hide file tree
Showing 8 changed files with 17 additions and 10 deletions.
3 changes: 2 additions & 1 deletion framework/modules/banners/controllers/bannerController.php
View file
Expand Up @@ -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'],
Expand Down
1 change: 1 addition & 0 deletions framework/modules/company/controllers/companyController.php
View file
Expand Up @@ -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'],
Expand Down
3 changes: 2 additions & 1 deletion framework/modules/ecommerce/controllers/ecomconfigController.php
View file
Expand Up @@ -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'],
Expand Down
3 changes: 2 additions & 1 deletion framework/modules/ecommerce/controllers/eventregistrationController.php
View file
Expand Up @@ -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'],
Expand Down
8 changes: 4 additions & 4 deletions framework/modules/ecommerce/controllers/orderController.php
View file
Expand Up @@ -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'],
Expand Down Expand Up @@ -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'],
Expand Down
3 changes: 2 additions & 1 deletion framework/modules/faq/controllers/faqController.php
View file
Expand Up @@ -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'],
Expand Down
3 changes: 2 additions & 1 deletion framework/modules/motd/controllers/motdController.php
View file
Expand Up @@ -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'],
Expand Down
3 changes: 2 additions & 1 deletion framework/modules/news/controllers/newsController.php
View file
Expand Up @@ -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'],
Expand Down

0 comments on commit c370cdc

Please sign in to comment.