Changeset 417:876968254009

Timestamp:

06/27/11 11:09:30 (14 years ago)

Author:

Dsls <dsls@…>

Branch:

formfilters

Message:

form filters intermediate commit, added in clause in dcBlog::getPosts user_id parameter, as well as user_id_not parameter.

Files:

• admin/js/filters.js (modified) (1 diff)
• admin/posts.php (modified) (2 diffs)
• inc/admin/class.dc.filter.php (modified) (4 diffs)
• inc/core/class.dc.blog.php (modified) (1 diff)

admin/js/filters.js

@@ -1 +1 @@
 $(function() {
      $('#toggle-filters').click(function(e) {
-          $('#filters').toggle('slow');
+          $('#filters').toggleClass('hidden');
      });
 });

admin/posts.php

@@ -157 +157 @@
 $filterSet
      ->addFilter(new comboFilter(
-          'users',__('Author'), 'user', $users_combo))
+          'users',__('Author'), 'user_id', $users_combo))
      ->addFilter(new comboFilter(
           'category',__('Category'), 'cat_id', $categories_combo))
@@ -214 +214 @@
      '<p class="col checkboxes-helpers"></p>'.
      
-     '<p class="col right"><label for="action" class="classic">'.__('Selected entries action:').'</label> '.
+     '<p class="col right"><span class="filter-title">'.__('Selected entries action:').'</span> '.
      form::combo('action',$combo_action).
      '<input type="submit" value="'.__('ok').'" /></p>'.

inc/admin/class.dc.filter.php

@@ -52 +52 @@
                     $this->hideform=false;
           }
-          if (isset($form_data['add_filter']) && isset($this->filters[$form_data['add_filter']])) {
+          if (isset($form_data['apply']) && (trim($form_data['apply']) == '+')
+               && isset($form_data['add_filter']) && isset($this->filters[$form_data['add_filter']])) {
                $this->filters[$form_data['add_filter']]->add();
+               $this->hideform=false;
           }
      }
@@ -72 +74 @@
      public function getForm($action,$extra_content,$method="get",$nb_cols=3) {
           $ret = '';
-          /*if ($this->hideform) {
-               $ret .= '<p><a id="filter-control" class="form-control" href="#">'.
-               __('Filters').'</a></p>';
-          }*/
-          $ret .= '<p><img alt="" src="minus.png"/> <a href="#" id="toggle-filters">'.__('Toggle filters and display options').'</a></p>';
+          
+          if ($this->hideform) {
+               $formclass = ' class="hidden"';
+          } else {
+               $formclass='';
+          }
+          $ret .= '<p><img alt="" src="images/minus.png" /> <a href="#" id="toggle-filters">'.__('Toggle filters and display options').'</a></p>';
           $ret .=
                '<div class="two-cols">'.
-               '<form id="filters" action="'.$this->action.'" method="get" id="filters-form">'.
+               '<form id="filters" action="'.$this->action.'" method="get" id="filters-form"'.$formclass.'>'.
                '<div class="col70">'.
                '<h3>'.__('Entries filters').'</h3>';
@@ -242 +246 @@
           parent::setValues($form_data);
           if (isset($form_data[$this->field_id."_v"])) {
-               $this->verb = $form_data[$this->field_id."_v"] == 'is' ? 'is' : 'isnot';
+               $this->verb = ($form_data[$this->field_id."_v"] == 'is') ? 'is' : 'isnot';
           }
      }
@@ -259 +263 @@
                $labelclass = ' class="or"';
           };
-          return '<label for="'.$this->getFieldId($pos).'"'.$labelclass.'>'.$desc.'</label>'.
-               (($pos == 0) ?form::combo($this->field_id.'_v',array(__('is')=>'is',__('is not')=>'isnot'),$this->verb) : '').
-               form::combo($this->getFieldId($pos),$this->options,$this->values[$pos]);
+          return '<span class="filter-title">'.$desc.'</span>'.
+               (($pos == 0) 
+                    ?form::combo($this->field_id.'_v',
+                         array(__('is')=>'is',__('is not')=>'isnot'),$this->verb,'','',
+                         false,'title="'.sprintf(__('%s is or is not'),$this->desc).'"') 
+                    :'').
+               form::combo($this->getFieldId($pos),$this->options,$this->values[$pos],
+                    '','',false,'title="'.__('Choose an option').'"');
      }
      
      public function applyFilter($params) {
+          $attr = $this->request_param;
+          if ($this->verb != "is") {
+               $params[$attr."_not"] = true;
+          }
           if (isset($this->extra['singleval']))
-               $params[$this->request_param]=$this->values[0];
+               $params[$attr]=$this->values[0];
           else
-               $params[$this->request_param]=$this->values;
+               $params[$attr]=$this->values;
      }
 }

inc/core/class.dc.blog.php

@@ -736 +736 @@
           
           if (!empty($params['user_id'])) {
-               $strReq .= "AND U.user_id = '".$this->con->escape($params['user_id'])."' ";
+               if (!empty($params['user_id_not'])) {
+                    $not = "NOT ";
+               } else {
+                    $not = "";
+               }
+               $strReq .= "AND U.user_id ".$not.$this->con->in($params['user_id'])." ";
           }