Changeset 804:f10e7e0dffe0 for inc

Timestamp:

03/16/12 09:13:56 (13 years ago)

Author:

Dsls <dsls@…>

Branch:

formfilters

Message:

Tuned formfilters. Added sortby and order to filter form

Location:

inc/admin

Files:

• class.dc.filter.php (modified) (2 diffs)
• class.dc.list.php (modified) (8 diffs)

inc/admin/class.dc.filter.php

@@ -236 +236 @@
                          if ($this->eextra != null) {
                               $this->eextra->save();
-                              $this->eextra->updateRequestParams($data);
                          }
                          http::redirect($this->action.'?'.http_build_query($data,'','&'));
@@ -260 +259 @@
                }
                if ($load_from_settings) {
-                    $get = new ArrayObject($this->loadFilters());
-                    if ($this->eextra != null) {
-                         $this->eextra->load();
-                         $this->eextra->updateRequestParams($get);
-                    }
+                    $get = new ArrayObject(array_merge($this->loadFilters(),$get));
                }
                $this->initializeFromData($this->efilters, $this->eextra, $get);
                $this->initializeFromData($this->lfilters, $this->lextra, $get);
+
           }
      }

inc/admin/class.dc.list.php

@@ -319 +319 @@
      {
           if (!is_null($this->sortby) && !is_null($this->order)) {
-               foreach ($this->columns as $k => $c) {
-                    if (
-                         $this->sortby === $c->getInfo('alias') &&
-                         in_array($this->order,array('asc','desc'))
-                    ) {
-                         $params['order'] = $this->sortby.' '.$this->order;
-                         break;
-                    }
+               if (
+                    isset($this->columns[$this->sortby]) &&
+                    in_array($this->order,array('asc','desc'))
+               ) {
+                    $params['order'] = $this->columns[$this->sortby]->getInfo('alias').' '.$this->order;
                }
           }
@@ -359 +356 @@
           
           $list = array();
-          
+          $sortby_combo = array();
           foreach ($this->columns as $k => $v) {
                $col_id = $this->form_prefix.$k;
@@ -368 +365 @@
                     array_push($list,$col_html);
                }
-          }
+               $sortby_combo[$v->getInfo('title')] = $k;
+          }
+          $order_combo = array(
+                    __('Descending') => 'desc',
+                    __('Ascending') => 'asc'
+          );
           
           $nb_per_page = !is_null($this->nb_per_page) ? $this->nb_per_page : 10;
@@ -376 +378 @@
           '<p><label for="nb_per_page">'.__('Items per page:').
           '</label>&nbsp;'.form::field('nb_per_page',3,3,$nb_per_page).
+          '</p>'.
+          '<p><label for="sortby">'.__('Sort by:').
+          '</label>&nbsp;'.form::combo('sortby',$sortby_combo,$this->sortby).
+          '</p>'.
+          '<p><label for="order">'.__('Order:').
+          '</label>&nbsp;'.form::combo('order',$order_combo,$this->order).
           '</p>';
      }
      
      public function updateRequestParams($params) {
-          if (!is_null($this->sortby)) {
-               $params['sortby'] = $this->sortby;
+          if (!is_null($this->sortby) && isset($this->columns[$this->sortby])) {
+               $params['sortby'] = $this->columns[$this->sortby]->getInfo('alias');
           }
           if (!is_null($this->order)) {
@@ -562 +570 @@
                $v->setVisibility($visibility);
           }
+          if (!isset($this->columns[$this->sortby])) {
+               // No alias found
+               $this->sortby='';
+          }
+
      }
      
@@ -604 +617 @@
           $this->sortby = array_key_exists('sortby',$data) ? $data['sortby'] : $this->sortby;
           $this->order = array_key_exists('order',$data) ? $data['order'] : $this->order;
-          $this->nb_per_page = array_key_exists('nb_per_page',$data) ? $data['nb_per_page'] : $this->nb_per_page;
+          $this->nb_per_page = array_key_exists('nb_per_page',$data) ? (integer) $data['nb_per_page'] : $this->nb_per_page;
           # Page
-          $this->page = array_key_exists('page',$data) ? $data['page'] : 1;
+          $this->page = array_key_exists('page',$data) ? (integer) $data['page'] : 1;
           if ($load_from_settings)
                return;
-
           foreach ($this->columns as $k => $v) {
                $key = $this->form_prefix.$k;
@@ -667 +679 @@
      {
           $order = 'desc';
-          if (!is_null($this->sortby) && $this->sortby === $c->getInfo('alias')) {
+          if (!is_null($this->sortby) && $this->sortby === $c->getInfo('id')) {
                if (!is_null($this->order) && $this->order === $order) {
                     $order = 'asc';
@@ -674 +686 @@
           
           $args = $_GET;
-          $args['sortby'] = $c->getInfo('alias');
+          $args['sortby'] = $c->getInfo('id');
           $args['order'] = $order;