Changeset 517:7a334cf98e87

Timestamp:

07/06/11 08:58:51 (14 years ago)

Author:

Dsls <dsls@…>

Branch:

formfilters

Message:

Added filter name, fixed php notice in filters.

Files:

• admin/comments.php (modified) (1 diff)
• admin/posts.php (modified) (1 diff)
• inc/admin/class.dc.filter.php (modified) (7 diffs)

admin/comments.php

@@ -74 +74 @@
 
 $authorFilter = new textFilter(
-          'author',__('Author'),'q_author',20,255);
+          'author',__('Author'), __('Author'),'q_author',20,255);
 $filterSet
      ->addFilter(new comboFilter(
-          'status',__('Status'), 'comment_status', $status_combo))
+          'status',__('Status'), __('Status'), 'comment_status', $status_combo))
      ->addFilter(new booleanFilter(
-          'type',__('Type'), 'comment_trackback', $type_combo))
+          'type',__('Type'), __('Type'), 'comment_trackback', $type_combo))
      ->addFilter($authorFilter)
      ->addFilter(new textFilter(
-          'ip',__('IP address'),'comment_ip',20,39));
+          'ip',__('IP address'), __('IP address'), 'comment_ip',20,39));
           
 $core->callBehavior('adminCommentsFilters',$filterSet);

admin/posts.php

@@ -152 +152 @@
 $filterSet
      ->addFilter(new comboFilter(
-          'users',__('Author'), 'user_id', $users_combo))
-     ->addFilter(new comboFilter(
-          'category',__('Category'), 'cat_id', $categories_combo))
-     ->addFilter(new comboFilter(
-          'post_status',__('Status'), 'post_status', $status_combo))
+          'users',__('Author'), __('Author'), 'user_id', $users_combo))
+     ->addFilter(new comboFilter(
+          'category',__('Category'), __('Category'), 'cat_id', $categories_combo))
+     ->addFilter(new comboFilter(
+          'post_status',__('Status'), __('Status'), 'post_status', $status_combo))
      ->addFilter(new booleanFilter(
-          'post_selected',__('The post :'), 'post_selected', $selected_combo))
-     ->addFilter(new comboFilter(
-          'lang',__('Lang'), 'post_lang', $lang_combo))
+          'post_selected',__('Selected'), __('The post : '),'post_selected', $selected_combo))
+     ->addFilter(new comboFilter(
+          'lang',__('Lang'), __('Lang'), 'post_lang', $lang_combo))
      ->addFilter(new monthComboFilter(
-          'month',__('Month'), 'post_month', $dt_m_combo,array('singleval' => 1)));
+          'month',__('Month'),__('Month'), 'post_month', $dt_m_combo,array('singleval' => 1)));
 
 $core->callBehavior('adminPostsFilters',$filterSet);

inc/admin/class.dc.filter.php

@@ -169 +169 @@
                          $ret .= $filter->getFormLine();
                     }
-                    $form_combo[$filter->desc]=$filter->id;
+                    $form_combo[$filter->name]=$filter->id;
                     $count++;
                }
@@ -237 +237 @@
 */
 abstract class Filter {
-     public $id;                        ///< <b>string</b> field id (local to fieldset)
-     public $desc;                 ///< <b>string</b> field description
-     protected $request_param;     ///< <b>string</b> resulting parameter array key
-     protected $enabled;           ///< <b>string</b> true if filter is enabled
-     protected $values;            ///< <b>array</b> possible filter values
-     public $field_id;             ///< <b>string</b> field id (global to the page)
+     public $id;                        ///<b>string</b> field id (local to fieldset)
+     public $name;                 ///<b>string</b> filter name
+     public $desc;                 ///<b>string</b> field description
+     protected $request_param;     ///<b>string</b> resulting parameter array key
+     protected $enabled;           ///<b>string</b> true if filter is enabled
+     protected $values;            ///<b>array</b> possible filter values
+     public $field_id;             ///<b>string</b> field id (global to the page)
      
      /**
@@ -250 +251 @@
      @param    form_prefix    <b>string</b>       form prefix to use for parameters
      */
-     public function __construct ($id,$desc,$request_param) {
+     public function __construct ($id,$name,$desc,$request_param) {
           $this->id = $id;
+          $this->name=$name;
           $this->desc = $desc;
           $this->request_param = $request_param;
@@ -413 +415 @@
      protected $extra;
      
-     public function __construct($id,$desc,$request_param,$options,$extra=array()) {
-          parent::__construct($id,$desc,$request_param);
+     public function __construct($id,$name,$desc,$request_param,$options,$extra=array()) {
+          parent::__construct($id,$name,$desc,$request_param);
           $this->options = $options;
           $this->extra = $extra;
@@ -496 +498 @@
      protected $options;
      
-     public function __construct($id,$desc,$request_param,$options,$extra=array()) {
-          parent::__construct($id,$desc,$request_param);
+     public function __construct($id,$name,$desc,$request_param,$options,$extra=array()) {
+          parent::__construct($id,$name,$desc,$request_param);
           $this->options = $options;
           $this->values=array();
@@ -508 +510 @@
      public function add() {
           parent::add();
-          $this->values[]=$options[0];
+          $this->values=current($this->options);
      }
 
@@ -527 +529 @@
      protected $max;
      
-     public function __construct($id,$desc,$request_param,$size,$max) {
-          parent::__construct($id,$desc,$request_param);
+     public function __construct($id,$name,$desc,$request_param,$size,$max) {
+          parent::__construct($id,$name,$desc,$request_param);
           $this->options = $options;
           $this->values=array();