Changeset 1158:9d7267aec27b

Timestamp:

06/12/13 11:38:49 (12 years ago)

Author:

Dsls <dsls@…>

Branch:

twig

Message:

Column ordering&sorting is now operational.

Files:

• admin/posts.php (modified) (1 diff)
• inc/admin/class.dc.filter.php (modified) (2 diffs)
• inc/admin/class.dc.form.php (modified) (1 diff)
• inc/admin/class.dc.list.php (modified) (4 diffs)

admin/posts.php

@@ -179 +179 @@
      ->addColumn(new dcColumn('cat',__('Category'),'cat_title'))
      ->addColumn(new dcColumn('date',__('Date'),'post_date'))
-     ->addColumn(new dcColumn('datetime',__('Date and Time'),'post_date'))
-     ->addColumn(new dcColumn('author',__('Author'),'post_author'))
+     ->addColumn(new dcColumn('datetime',__('Date and Time'),'post_dt'))
+     ->addColumn(new dcColumn('author',__('Author'),'user_id'))
      ->addColumn(new dcColumn('status',__('Status'),'post_status'));
 

inc/admin/class.dc.filter.php

@@ -37 +37 @@
      /** @var dcCore dotclear core object */
      protected $core;
+     /** @var boolean true if content is filtered */
+     protected $filtered;
 
     /**
@@ -770 +772 @@
           return $this->field;
      }
-
 }
 

inc/admin/class.dc.form.php

@@ -601 +601 @@
      * @return mixed Value.
      */
-     public function end()
+     public function end($attr=array())
      {
           $this->core->tpl->getExtension('dc_form')->renderWidget(
-               'endform');
+               'endform',$attr);
      }
 

inc/admin/class.dc.list.php

@@ -23 +23 @@
      protected $nb_pages;
      protected $page;
+     protected $sortby;
+     protected $order;
 
 
@@ -71 +73 @@
                $columns_combo[$c->getID()] = $c->getName();
           }
-          $this->filterset->addFilter(new dcFilterCombo(
+          $this->sortby = new dcFilterCombo(
                'sortby',
                __('Sort By'), 
-               __('Sort by'), 'sortby', $columns_combo,array('singleval'=> true,'static' => true)));
+               __('Sort by'), 'sortby', $columns_combo,array('singleval'=> true,'static' => true));
+          $this->filterset->addFilter($this->sortby);
           $order_combo = array('asc' => __('Ascending'),'desc' => __('Descending'));
-          $this->filterset->addFilter(new dcFilterCombo(
+          $this->order = new dcFilterCombo(
                'order',
                __('Order'), 
-               __('Order'), 'orderby', $order_combo,array('singleval'=> true, 'static' => true)));
+               __('Order'), 'orderby', $order_combo,array('singleval'=> true, 'static' => true));
           $limit = new dcFilterText(
                'limit',
                __('Limit'), __('Limit'), 'limit',array('singleval'=> true,'static' =>true));
+          $this->filterset->addFilter($this->order);
           $this->filterset->addFilter($limit);
           $this->filterset->setup();
@@ -107 +111 @@
           }
           $offset = $this->nb_items_per_page*($this->page-1);
+          $params['order'] = $this->getOrder();
           $entries = $this->fetcher->getEntries($params,$offset,$this->nb_items_per_page);
           $this->setEntries($entries);
@@ -152 +157 @@
 
      public function addColumn($c) {
-          $this->columns[] = $c;
+          $this->columns[$c->getID()] = $c;
           $c->setForm($this);
           return $this;
+     }
+
+     public function getOrder() {
+          $id = $this->sortby->getFields()->getValue();
+
+          return $this->columns[$id]->getColID().' '.$this->order->getFields()->getValue();
      }