Changeset 1498:6d67bea812f3 for inc/admin/class.dc.list.php

Timestamp:

08/20/13 16:32:39 (12 years ago)

Author:

Dsls

Branch:

twig

Message:

formfilters improvement, added applied filters features

File:

• inc/admin/class.dc.list.php (modified) (5 diffs)

inc/admin/class.dc.list.php

@@ -14 +14 @@
 
      protected $columns;
+     protected $columns_combo;
      protected $entries;
      protected $filterset;
@@ -54 +55 @@
      @param    form_prefix    <b>string</b>       form prefix to use for parameters
      */
-     public function __construct($core,$name,$filterset,$fetcher,$action,$form_prefix="f_") {
+     public function __construct($core,$name,$fetcher,$action,$form_prefix="f_") {
           parent::__construct($core,$name,$action,'POST');
           $this->entries = array();
@@ -60 +61 @@
           $this->selection = new dcFieldCheckbox('entries',NULL,array('multiple' => true));
           $this->addField($this->selection);
-          $this->filterset = $filterset;
           $this->fetcher = $fetcher;
-     }
-
-     public function setup() {
-          $this
-               ->addField(new dcFieldCombo('action','',array(), array(
-                    'label' => __('Selected entries action:'))))
-               ->addField(new dcFieldSubmit('ok',__('ok'), array()));
-          $columns_combo = array();
-          foreach ($this->columns as $c) {
-               $columns_combo[$c->getID()] = $c->getName();
-          }
+          $this->filterset = null;
+     }
+     
+     protected function setupFilterset() {
           $this->sortby = new dcFilterCombo(
                'sortby',
                __('Sort By'), 
-               __('Sort by'), 'sortby', $columns_combo,array('singleval'=> true,'static' => true));
+               __('Sort by'), 'sortby', $this->columns_combo,array('singleval'=> true,'static' => true));
           $this->filterset->addFilter($this->sortby);
           $order_combo = array('asc' => __('Ascending'),'desc' => __('Descending'));
@@ -88 +81 @@
           $this->filterset->addFilter($this->order);
           $this->filterset->addFilter($limit);
-          $this->filterset->setup();
+          $this->filterset->setup();    
+          $this->nb_items_per_page = $limit->getFields()->getValue();
+
+     }
+     
+     public function setup() {
+          $this
+               ->addField(new dcFieldCombo('action','',array(), array(
+                    'label' => __('Selected entries action:'))))
+               ->addField(new dcFieldSubmit('ok',__('ok'), array()));
+          $this->columns_combo = array();
+          foreach ($this->columns as $c) {
+               $this->columns_combo[$c->getID()] = $c->getName();
+          }
+          if ($this->filterset !== null) {
+               $this->setupFilterset();
+          }
           parent::setup();
-          $this->nb_items_per_page = $limit->getFields()->getValue();
           if ($this->nb_items_per_page == 0)
                $this->nb_items_per_page = 10;
@@ -99 +107 @@
      protected function fetchEntries() {
           $params = new ArrayObject();
-          $this->filterset->applyFilters($params);
+          if ($this->filterset != null) {
+               $this->filterset->applyFilters($params);
+          }
           $this->nb_items = $this->fetcher->getEntriesCount($params);
           $this->nb_pages = round($this->nb_items / $this->nb_items_per_page) + 1;