Changeset 3783

Timestamp:

06/21/11 11:23:18 (2 years ago)

Author:

wjohnald

Message:

refactored some query getters

Location:

plugins/apostrophePeoplePlugin/trunk/lib/actions

Files:

• PluginaPeopleActions.class.php (modified) (3 diffs)
• PluginaPeopleComponents.class.php (modified) (1 diff)

plugins/apostrophePeoplePlugin/trunk/lib/actions/PluginaPeopleActions.class.php

@@ -21 +21 @@
   {
     // Set default categories for the people sidebar as a session variable
-    $defaultCategories = array();
     if ($request->getParameter('aPeopleCategoryFilter'))
     {
+      $defaultCategories = array();
       $categoryFilter = $this->getRequest()->getParameter('aPeopleCategoryFilter');
 
@@ -63 +63 @@
                         ->leftJoin('p.Categories c');
 
-                $ids = array();
-                foreach($this->page->Categories as $category)
-                {
-                        $ids[] = $category->id;
-                }
-    
-    foreach(aPeopleTools::getAttribute('categories_filter', array()) as $id)
-    {
-      $ids[] = $id;
-    }
-
+    $ids = $this->getQueryCategoryIds();
     if(count($ids))
                 {
@@ -81 +71 @@
                 return $query;
         }
+
+  protected function getQueryCategoryIds()
+  {
+    $ids = array();
+                foreach($this->page->Categories as $category)
+                {
+                        $ids[] = $category->id;
+                }
+
+    foreach(aPeopleTools::getAttribute('categories_filter', array()) as $id)
+    {
+      $ids[] = $id;
+    }
+
+    return $ids;
+  }
 
   /**

plugins/apostrophePeoplePlugin/trunk/lib/actions/PluginaPeopleComponents.class.php

@@ -20 +20 @@
   public function executeSidebar(sfWebRequest $request)
   {
+    $this->form = new aPeopleCategoryForm($this->getFilterDefaults());
+    $this->actionUrl = url_for($request->getUri());
+  }
+
+  protected function getFilterDefaults()
+  {
     $defaults = array();
     $defaults['categories'] = aPeopleTools::getAttribute('categories_filter', array());
 
-    $this->form = new aPeopleCategoryForm($defaults);
-    $this->actionUrl = url_for($request->getUri());
+    return $defaults;
   }