Changeset 439:f6cd5149f3ad

Timestamp:

06/29/11 13:00:05 (14 years ago)

Author:

Dsls <dsls@…>

Branch:

formfilters

Children:

451:d7906f5087fd, 460:663ac1e64e11

Message:

Missed some changes... completes [438]

Files:

• admin/posts.php (modified) (3 diffs)
• inc/core/class.dc.blog.php (modified) (3 diffs)

admin/posts.php

@@ -74 +74 @@
      
      $selected_combo = array(
-     __('selected') => '1',
-     __('not selected') => '0'
+     __('is selected') => '1',
+     __('is not selected') => '0'
      );
      
@@ -147 +147 @@
 $params['no_content'] = true;
 
-$filterSet = new dcFilterSet('posts.php');
+$filterSet = new dcFilterSet('posts','posts.php');
 class monthComboFilter extends comboFilter {
      public function applyFilter($params) {
@@ -162 +162 @@
      ->addFilter(new comboFilter(
           'post_status',__('Status'), 'post_status', $status_combo,array('singleval' => 1)))
-     ->addFilter(new comboFilter(
-          'post_selected',__('Selected'), 'post_selected', $selected_combo))
+     ->addFilter(new booleanFilter(
+          'post_selected',__('The post :'), 'post_selected', $selected_combo))
      ->addFilter(new comboFilter(
           'lang',__('Lang'), 'post_lang', $lang_combo))
      ->addFilter(new monthComboFilter(
           'month',__('Month'), 'post_month', $dt_m_combo,array('singleval' => 1)));
+
 $filterSet->setValues($_GET);
 

inc/core/class.dc.blog.php

@@ -1433 +1433 @@
      {
           $field = $field == 'cat_id' ? 'cat_id' : 'cat_url';
-          
           $sub = array();
           $not = array();
@@ -1447 +1446 @@
                if (isset($args['not'])) { $not[$id] = 1; }
                if (isset($args['sub'])) { $sub[$id] = 1; }
+               $nullExcluded = false;
                if ($field == 'cat_id') {
                     if (preg_match('/^null$/i',$id)) {
                          $queries[$id] = 'P.cat_id IS NULL';
+                         if ($not[$id]) {
+                              $nullExcluded = true;
+                         }
                     }
                     else {
@@ -1491 +1494 @@
           
           if ($sql[1]) {
-               $sql[1] = '(P.cat_id IS NULL OR NOT('.$sql[1].'))';
+               if ($nullExcluded) {
+                    $sql[1] = 'NOT('.$sql[1].')';
+               } else {
+                    $sql[1] = '(P.cat_id IS NULL OR NOT('.$sql[1].'))';
+               }
           } else {
                unset($sql[1]);
           }
-          
           return implode(' AND ',$sql);
      }