Changeset 770:6e843790df75 for inc

Timestamp:

11/18/11 11:04:55 (14 years ago)

Author:

Dsls <dsls@…>

Branch:

formfilters

Message:

Columns sorting now operational, but not saved yet.

Location:

inc/admin

Files:

• class.dc.filter.php (modified) (1 diff)
• class.dc.list.php (modified) (1 diff)

inc/admin/class.dc.filter.php

@@ -247 +247 @@
           } else {
                // Use case (2)
-               if (count($get)==0) {
+               $load_from_settings = true;
+               foreach($get as $k=>$v) {
+                    if (strpos($k,$this->form_prefix)===0) {
+                         $load_from_settings=false;
+                         break;
+                    }
+               }
+               if ($load_from_settings) {
                     $get = new ArrayObject($this->loadFilters());
                     if ($this->eextra != null) {

inc/admin/class.dc.list.php

@@ -592 +592 @@
      public function initializeFromData ($data)
      {
+          $load_from_settings = true;
+          foreach ($data as $k=>$v) {
+               if (strpos($this->form_prefix,$k)===0) {
+                    $load_from_settings = false;
+               }
+          }
+          if ($load_from_settings) {
+               $this->load();
+          }
           # 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;
+          if ($load_from_settings)
+               return;
           foreach ($this->columns as $k => $v) {
                $key = sprintf($this->form_prefix,$k);