Changeset 2309:850b5f27bcad

Timestamp:

10/08/13 00:15:04 (12 years ago)

Author:

Eve Le Cellier <linux@…>

Branch:

default

Message:

Add attachment filter for post list, see ticket #989 -- thanks Franck for the patch

Files:

• admin/posts.php (modified) (5 diffs)
• inc/admin/actions/class.dcactionposts.php (modified) (1 diff)
• inc/core/class.dc.blog.php (modified) (3 diffs)
• locales/fr/main.po (modified) (1 diff)

admin/posts.php

@@ -76 +76 @@
      );
      
+     $attachment_combo = array(
+     '-' => '',
+     __('With attachments') => '1',
+     __('Without attachments') => '0'
+     );
+
      # Months array
      $dt_m_combo = array_merge(
@@ -118 +124 @@
 $status = isset($_GET['status']) ? $_GET['status'] : '';
 $selected = isset($_GET['selected']) ?  $_GET['selected'] : '';
+$attachment = isset($_GET['attachment']) ?   $_GET['attachment'] : '';
 $month = !empty($_GET['month']) ?       $_GET['month'] : '';
 $lang = !empty($_GET['lang']) ?         $_GET['lang'] : '';
@@ -168 +175 @@
 } else {
      $selected='';
+}
+
+# - Selected filter
+if ($attachment !== '' && in_array($attachment,$attachment_combo)) {
+     $params['media'] = $attachment;
+     $show_filters = true;
+} else {
+     $attachment='';
 }
 
@@ -260 +275 @@
      '<p><label for="selected" class="ib">'.__('Selected:').'</label> '.
      form::combo('selected',$selected_combo,$selected).'</p>'.
+     '<p><label for="attachment" class="ib">'.__('Attachments:').'</label> '.
+     form::combo('attachment',$attachment_combo,$attachment).'</p>'.
      '<p><label for="month" class="ib">'.__('Month:').'</label> '.
      form::combo('month',$dt_m_combo,$month).'</p>'.
@@ -298 +315 @@
      form::hidden(array('status'),$status).
      form::hidden(array('selected'),$selected).
+     form::hidden(array('attachment'),$attachment).
      form::hidden(array('month'),$month).
      form::hidden(array('lang'),$lang).

inc/admin/actions/class.dcactionposts.php

@@ -17 +17 @@
           parent::__construct($core,$uri,$redirect_args);
           $this->redirect_fields = array('user_id','cat_id','status',
-          'selected','month','lang','sortby','order','page','nb');
+          'selected','attachment','month','lang','sortby','order','page','nb');
           $this->loadDefaults();
      }

inc/core/class.dc.blog.php

@@ -806 +806 @@
           'INNER JOIN '.$this->prefix.'user U ON U.user_id = P.user_id '.
           'LEFT OUTER JOIN '.$this->prefix.'category C ON P.cat_id = C.cat_id ';
+
+          if (isset($params['media'])) {
+               if ($params['media'] == '0') {
+                    $strReq .= 'LEFT OUTER JOIN '.$this->prefix.'post_media M on P.post_id = M.post_id ';
+               } else {
+                    $strReq .= 'INNER JOIN '.$this->prefix.'post_media M on P.post_id = M.post_id ';
+               }
+          }
           
           if (!empty($params['from'])) {
@@ -937 +945 @@
           }
           
+          if (isset($params['media'])) {
+               if ($params['media'] == '0') {
+                    $strReq .= ' AND M.post_id IS NULL ';
+               }
+          }
+
           if (!empty($params['sql'])) {
                $strReq .= $params['sql'].' ';
           }
           
+          if (!$count_only && isset($params['media'])) {
+               $strReq .= ' GROUP BY P.post_id ';
+          }
+
           if (!$count_only)
           {
@@ -957 +975 @@
                return $strReq;
           }
-          
+
           $rs = $this->con->select($strReq);
           $rs->core = $this->core;

locales/fr/main.po

@@ -4039 +4039 @@
 msgid "Number of trackbacks"
 msgstr "Nombre de rétroliens"
+
+msgid "Attachments:"
+msgstr "Annexes :"
+
+msgid "With attachments"
+msgstr "Avec annexe(s)"
+
+msgid "Without attachments"
+msgstr "Sans annexes"