Changeset 756:5127beea4a3a for admin

Timestamp:

11/10/11 16:12:01 (14 years ago)

Author:

Dsls <dsls@…>

Branch:

formfilters

Message:

• Adapted comments.php do new filters
• added author filter, with autocompletion
• added comment_author parameter to dcBlog::getComments
• removed jquery.autocomplete
• added jquery UI (should be refined, this is quite raw...)
• added dcPager::jqueryUI
• adapted tags plugin to new jquery ui autocomplete

Location:

admin

Files:

• comments.php (modified) (4 diffs)
• posts.php (modified) (3 diffs)
• services.php (modified) (2 diffs)

admin/comments.php

@@ -14 +14 @@
 
 dcPage::check('usage,contentadmin');
+
+class authorFilter extends textFilter {
+     public function header() {
+          return 
+               dcPage::jqueryUI().
+               dcPage::jsLoad('js/author_filter.js')
+               ;
+     }
+     public function applyFilter($params) {
+          $val = preg_split("/[\s,]+/",$this->values[0]);
+          $params[$this->request_param]=$val;
+     }
+}
+
 
 # Creating filter combo boxes
@@ -54 +68 @@
 $filterSet = new dcFilterSet('comments','comments.php');
 
-$authorFilter = new textFilter(
-          'author',__('Author'), __('Author'),'q_author',20,255);
+$authorFilter = new authorFilter(
+          'author',__('Author'), __('Author'),'comment_author',20,255);
 $filterSet
      ->addFilter(new comboFilter(
@@ -67 +81 @@
 $core->callBehavior('adminCommentsFilters',$filterSet);
 
-$filterSet->setFormValues($_GET);
+$filterSet->setup($_GET,$_POST);
 if (isset($_GET['author'])) {
      $authorFilter->add();
@@ -91 +105 @@
      $core->error->add($e->getMessage());
 }
-$filterSet->setColumnsForm($comment_list->getColumnsForm());
+$filterSet->setExtraData($comment_list->getColumnsForm());
 
 /* DISPLAY
 -------------------------------------------------------- */
-$starting_script = dcPage::jsLoad('js/_comments.js').$filterSet->header();;
+$starting_script = dcPage::jsLoad('js/_comments.js').$filterSet->header();
 
 # --BEHAVIOR-- adminCommentsHeaders

admin/posts.php

@@ -138 +138 @@
      ->addFilter(new comboFilter(
           'users',__('Author'), __('Author'), 'user_id', $users_combo))
-     ->addFilter(new comboFilter(
+     ->addFilter(new categoryFilter(
           'category',__('Category'), __('Category'), 'cat_id', $categories_combo))
      ->addFilter(new comboFilter(
@@ -147 +147 @@
           'lang',__('Lang'), __('Lang'), 'post_lang', $lang_combo))
      ->addFilter(new monthComboFilter(
-          'month',__('Month'),__('Month'), 'post_month', $dt_m_combo,array('singleval' => 1)));
+          'month',__('Month'),__('Month'), 'post_month', $dt_m_combo,array('singleval' => 1)))
+     ->addFilter(new textFilter(
+          'search',__('Contains'),__('The entry contains'), 'search',20,255));
 
 $core->callBehavior('adminPostsFilters',$filterSet);
@@ -165 +167 @@
      } else {
           $page_title = __('Entries');
+          $filters_info = '';
      }
      $post_list->setItems($posts,$counter->f(0));

admin/services.php

@@ -25 +25 @@
 $core->rest->addFunction('delMeta',array('dcRestMethods','delMeta'));
 $core->rest->addFunction('setPostMeta',array('dcRestMethods','setPostMeta'));
+$core->rest->addFunction('searchCommentAuthor',array('dcRestMethods','searchCommentAuthor'));
 $core->rest->addFunction('searchMeta',array('dcRestMethods','searchMeta'));
 
@@ -393 +394 @@
           return $rsp;
      }
+
+     public static function searchCommentAuthor($core,$get)
+     {
+          $q = !empty($get['q']) ? strtoupper($get['q']) : null;
+          
+          $strReq = 'SELECT DISTINCT C.comment_author '.
+               'FROM '.$core->prefix.'comment C '.
+               'INNER JOIN '.$core->prefix.'post P on C.post_id = P.post_id '.
+               'WHERE P.blog_id = \''.$core->blog->id.'\' '.
+               'AND UPPER(comment_author) like \'%'.$core->con->escape($q).'%\''
+               ;
+          //echo $strReq;
+          $rs = $core->con->select($strReq);
+          $rsp = new xmlTag();
+          
+          while ($rs->fetch())
+          {
+               $author = new xmlTag('author');
+               $author->name=$rs->comment_author;
+               $rsp->insertNode($author);
+          }
+          
+          return $rsp;
+     }
+
 }
 ?>