Changeset 523:015af077c7fa for admin

Timestamp:

07/06/11 13:47:44 (14 years ago)

Author:

Tomtom33 <tbouron@…>

Branch:

formfilters

Parents:

522:d3f4ee32b4a4 (diff), 517:7a334cf98e87 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge with previous commits

Location:

admin

Files:

• comments.php (modified) (5 diffs)
• comments.php (modified) (1 diff)
• posts.php (modified) (4 diffs)
• posts.php (modified) (1 diff)

admin/comments.php

@@ -27 +27 @@
 );
 
-$sortby_combo = array(
-__('Date') => 'comment_dt',
-__('Entry title') => 'post_title',
-__('Author') => 'comment_author',
-__('Status') => 'comment_status'
-);
+$comment_list = new adminCommentList($core);
 
-$order_combo = array(
-__('Descending') => 'desc',
-__('Ascending') => 'asc'
-);
+$params = new ArrayObject();
+$params['no_content'] = true;
 
-
-
-$page = !empty($_GET['page']) ? (integer) $_GET['page'] : 1;
-$nb_per_page =  30;
-
-if (!empty($_GET['nb']) && (integer) $_GET['nb'] > 0) {
-     if ($nb_per_page != $_GET['nb']) {
-          $show_filters = true;
-     }
-     $nb_per_page = (integer) $_GET['nb'];
-}
-$params = new ArrayObject();
-$params['limit'] = array((($page-1)*$nb_per_page),$nb_per_page);
-$params['no_content'] = true;
+# - Limit, sortby and order filter
+$params = $comment_list->applyFilters($params);
 
 # Actions combo box
@@ -106 +87 @@
      }
 
-     $comment_list = new adminCommentList($core,$comments,$counter->f(0));
+     $comment_list->setItems($comments,$counter->f(0));
 } catch (Exception $e) {
      $core->error->add($e->getMessage());
@@ -126 +107 @@
 {
      # Filters
-     if (!$show_filters) {
-          echo '<p><a id="filter-control" class="form-control" href="#">'.
-          __('Filters').'</a></p>';
-     }
      $filterSet->display();
      
@@ -144 +121 @@
      
      # Show comments
-     $comment_list->display($page,$nb_per_page,
-     '<form action="comments_actions.php" method="post" id="form-comments">'.
+     $comment_list->display('<form action="comments_actions.php" method="post" id="form-comments">'.
      
      '%s'.
@@ -157 +133 @@
      '<input type="submit" value="'.__('ok').'" /></p>'.
      form::hidden(array('type'),$type).
-     form::hidden(array('sortby'),$sortby).
-     form::hidden(array('order'),$order).
      form::hidden(array('author'),preg_replace('/%/','%%',$author)).
      form::hidden(array('status'),$status).
      form::hidden(array('ip'),preg_replace('/%/','%%',$ip)).
-     form::hidden(array('page'),$page).
-     form::hidden(array('nb'),$nb_per_page).
+     $comment_list->getFormFieldsAsHidden().
      '</div>'.
      

admin/comments.php

@@ -55 +55 @@
 
 $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

@@ -119 +119 @@
 /* Get posts
 -------------------------------------------------------- */
-$page = !empty($_GET['page']) ? (integer) $_GET['page'] : 1;
-$nb_per_page =  30;
-
-if (!empty($_GET['nb']) && (integer) $_GET['nb'] > 0) {
-     if ($nb_per_page != $_GET['nb']) {
-          $show_filters = true;
-     }
-     $nb_per_page = (integer) $_GET['nb'];
-}
+$post_list = new adminPostList($core);
 
 $params = new ArrayObject();
-$params['limit'] = array((($page-1)*$nb_per_page),$nb_per_page);
 $params['no_content'] = true;
 
-# - Sortby and order filter
-$sortby = !empty($_GET['sortby']) ? $_GET['sortby'] : 'post_dt';
-$order = !empty($_GET['order']) ? $_GET['order'] : 'desc';
-if ($sortby !== '') {
-     if ($order !== '') {
-          $params['order'] = $sortby.' '.$order;
-     }
-}
+# - Limit, sortby and order filter
+$params = $post_list->applyFilters($params);
 
 $filterSet = new dcFilterSet('posts','posts.php');
@@ -181 +166 @@
           $page_title = __('Entries');
      }
-     $post_list = new adminPostList($core,$posts,$counter->f(0));
+     $post_list->setItems($posts,$counter->f(0));
 } catch (Exception $e) {
      $core->error->add($e->getMessage());
@@ -205 +190 @@
 
      # Show posts
-     $post_list->display($page,$nb_per_page,
-     '<form action="posts_actions.php" method="post" id="form-entries">'.
+     $post_list->display('<form action="posts_actions.php" method="post" id="form-entries">'.
      
      '%s'.
@@ -217 +201 @@
      '<input type="submit" value="'.__('ok').'" /></p>'.
      $filterSet->getFormFieldsAsHidden().
+     $post_list->getFormFieldsAsHidden().
      $core->formNonce().
      '</div>'.

admin/posts.php

@@ -137 +137 @@
 $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);