Changeset 764:1f013109b32f for inc/admin/class.dc.list.php

Timestamp:

11/14/11 16:09:59 (14 years ago)

Author:

Dsls <dsls@…>

Branch:

formfilters

Message:

Next step in formfilters : columns now work, sorting still broken...

File:

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

inc/admin/class.dc.list.php

@@ -259 +259 @@
 Dotclear items list handles administration lists
 */
-abstract class adminItemsList
+abstract class adminItemsList implements dcFilterExtraInterface
 {
      protected $core;
@@ -285 +285 @@
           $this->core = $core;
           $this->context = get_class($this);
-          $this->columns = array();
+          $this->columns = new ArrayObject();
           $this->form_prefix = 'col_%s';
-          $this->form_trigger = 'add_filter';
           
           $this->html_prev = __('prev');
@@ -294 +293 @@
           $this->html_end = __('end');
           
-          $this->setOptions();
+          $this->nb_per_page = 10;
           
           $this->setColumns();
@@ -301 +300 @@
           $core->callBehavior('adminItemsListConstruct',$this);
           
-          $this->setColumnsVisibility();
-     }
-     
+     }
+     
+     public function __clone() {
+          $arr = new ArrayObject();
+          foreach ($this->columns as $k=>$v) {
+               $arr[$k]= clone $v;
+          }
+          $this->columns = $arr;
+     }
      /**
      Apply limit, sortby and order filters to items parameters
@@ -347 +352 @@
      @return   <b>string</b>       HTML code form
      */
-     public function getColumnsForm()
+     public function getFormContent()
      {
           $block = 
@@ -372 +377 @@
           '</label>&nbsp;'.form::field('nb_per_page',3,3,$nb_per_page).
           '</p>';
+     }
+     
+     public function updateRequestParams($params) {
+          if (!is_null($this->sortby)) {
+               $params['sortby'] = $this->sortby;
+          }
+          if (!is_null($this->order)) {
+               $params['order'] = $this->order;
+          }
+          if (!is_null($this->nb_per_page)) {
+               $params['nb_per_page'] = $this->nb_per_page;
+          }
+          if (!is_null($this->page)) {
+               $params['page'] = $this->page;
+          }
+          foreach ($this->columns as $k => $v) {
+               if($v->isVisible())
+                    $params[sprintf($this->form_prefix,$k)] = 1;
+          }
+
      }
      
@@ -514 +539 @@
      
      /**
-     Returns default HTMl code line
+     Returns default HTML code line
      
      @return   <b>string</b>       Default HTMl code line
@@ -524 +549 @@
      
      /**
-     Sets options of defined list
-     */
-     private function setOptions()
-     {
-          $opts = $_GET;
-          
+     Loads list from user settings
+     */
+     public function load() {
           $ws = $this->core->auth->user_prefs->addWorkspace('lists');
-          
           $user_pref = !is_null($ws->{$this->context.'_opts'}) ? unserialize($ws->{$this->context.'_opts'}) : array();
-          # Sortby
           $this->sortby = array_key_exists('sortby',$user_pref) ? $user_pref['sortby'] : null;
-          $this->sortby = array_key_exists('sortby',$opts) ? $opts['sortby'] : $this->sortby;
-          $user_pref['sortby'] = $this->sortby;
-          # Order
           $this->order = array_key_exists('order',$user_pref) ? $user_pref['order'] : null;
-          $this->order = array_key_exists('order',$opts) ? $opts['order'] : $this->order;
-          $user_pref['order'] = $this->order;
-          # Number per page
           $this->nb_per_page = array_key_exists('nb_per_page',$user_pref) ? $user_pref['nb_per_page'] : 10;
-          $this->nb_per_page = array_key_exists('nb_per_page',$opts) ? $opts['nb_per_page'] : $this->nb_per_page;
-          $user_pref['nb_per_page'] = $this->nb_per_page;
-          
-          if (array_key_exists('sortby',$opts) || array_key_exists('order',$opts) || array_key_exists('nb_per_page',$opts)) {
-               $this->core->auth->user_prefs->lists->put($this->context.'_opts',serialize($user_pref),'string');
-          }
-          
-          # Page
-          $this->page = array_key_exists('page',$opts) ? $opts['page'] : 1;
-     }
-     
-     /**
-     Sets columns visibility of defined list
-     */
-     private function setColumnsVisibility()
-     {
-          $opts = $_GET;
-          
-          # Visibility
-          $ws = $this->core->auth->user_prefs->addWorkspace('lists');
-          
           $user_pref = !is_null($ws->{$this->context.'_col'}) ? unserialize($ws->{$this->context.'_col'}) : array();
-          
           foreach ($this->columns as $k => $v) {
                $visibility =  array_key_exists($k,$user_pref) ? $user_pref[$k] : true;
-               if (array_key_exists($this->form_trigger,$opts)) {
-                    $key = sprintf($this->form_prefix,$k);
-                    $visibility = !array_key_exists($key,$opts) ? false : true;
-               }
                $v->setVisibility($visibility);
-               $user_pref[$k] = $visibility;
-          }
-          
-          if (array_key_exists($this->form_trigger,$opts)) {
-               $this->core->auth->user_prefs->lists->put($this->context.'_col',serialize($user_pref),'string');
+          }
+     }
+     
+     /**
+     Saves list to user settings
+     */
+     public function save() {
+          $ws = $this->core->auth->user_prefs->addWorkspace('lists');
+          $user_pref = !is_null($ws->{$this->context.'_opts'}) ? unserialize($ws->{$this->context.'_opts'}) : array();
+          $user_pref['order'] = $this->order;
+          $user_pref['nb_per_page'] = $this->nb_per_page;
+          $user_pref['sortby'] = $this->sortby;
+          
+          $this->core->auth->user_prefs->lists->put($this->context.'_opts',serialize($user_pref),'string');
+          
+          $user_pref = !is_null($ws->{$this->context.'_col'}) ? unserialize($ws->{$this->context.'_col'}) : array();
+          
+          foreach ($this->columns as $k => $v) {
+               $user_pref[$k] = $v->isVisible();
+          }
+          $this->core->auth->user_prefs->lists->put($this->context.'_col',serialize($user_pref),'string');
+     }
+     
+     /**
+     Set dedicated data from form submission 
+     (either $_GET or $_POST depending on the context
+     
+     @param    data      <b>array</b>        Data to retrieve information from
+     */
+     public function initializeFromData ($data)
+     {
+          # Sortby
+          $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;
+          
+          # Page
+          $this->page = array_key_exists('page',$data) ? $data['page'] : 1;
+          foreach ($this->columns as $k => $v) {
+               $key = sprintf($this->form_prefix,$k);
+               $visibility = !array_key_exists($key,$data) ? false : true;
+               $v->setVisibility($visibility);
           }
      }