Changeset 3782

Timestamp:

06/21/11 11:03:27 (2 years ago)

Author:

wjohnald

Message:

refactored categories filter to be saved in the session. Added a wrapper to aPeopleTools for setting and getting user attributes.

Location:

plugins/apostrophePeoplePlugin/trunk

Files:

• lib/actions/PluginaPeopleActions.class.php (modified) (3 diffs)
• lib/actions/PluginaPeopleComponents.class.php (modified) (1 diff)
• lib/form/PluginaPeopleCategoryForm.class.php (modified) (2 diffs)
• lib/toolkit (added)
• lib/toolkit/BaseaPeopleTools.class.php (added)
• lib/toolkit/aPeopleTools.class.php (added)
• modules/aPeople/templates/indexSuccess.php (modified) (1 diff)

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

@@ -20 +20 @@
   public function executeIndex(sfWebRequest $request)
   {
+    // Set default categories for the people sidebar as a session variable
+    $defaultCategories = array();
+    if ($request->getParameter('aPeopleCategoryFilter'))
+    {
+      $categoryFilter = $this->getRequest()->getParameter('aPeopleCategoryFilter');
+
+      if (!empty($categoryFilter['categories']))
+      {
+        $defaultCategories = $categoryFilter['categories'];
+      }
+
+      aPeopleTools::setAttribute('categories_filter', $defaultCategories);
+    }
+
+
     $query = $this->buildQuery(); 
     $this->navChars    = Doctrine::getTable('aPerson')->getAtoZ($request->getParameter('category'), null, $query);
@@ -39 +54 @@
     $this->anchorNavigation = ($request->hasParameter('category') || $request->hasParameter('viewAll'));
 
-
-    // Set default categories for the people sidebar
-    $this->defaultCategories = array();
-    if ($request->getParameter('aPeopleCategoryFilter'))
-    {
-      $categoryFilter = $this->getRequest()->getParameter('aPeopleCategoryFilter');
-
-      if (!empty($categoryFilter['categories']))
-      {
-        $this->defaultCategories = $categoryFilter['categories'];
-      }
-    }
-
     return $this->pageTemplate;
   }
@@ -66 +68 @@
                         $ids[] = $category->id;
                 }
-
-    // If the filter has been set, filter by categories
-    if ($this->getRequest()->hasParameter('aPeopleCategoryFilter'))
+    
+    foreach(aPeopleTools::getAttribute('categories_filter', array()) as $id)
     {
-      $categoryFilter = $this->getRequest()->getParameter('aPeopleCategoryFilter');
-
-      if (!empty($categoryFilter['categories']))
-      {
-        foreach($categoryFilter['categories'] as $id)
-        {
-          $ids[] = $id;
-        }
-      }
-
+      $ids[] = $id;
     }
 
-                if(count($ids))
+    if(count($ids))
                 {
                         $query->andWhereIn('c.id', $ids);

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

@@ -21 +21 @@
   {
     $defaults = array();
-
-    if (!empty($this->defaultCategories))
-    {
-      $defaults['categories'] = $this->defaultCategories;
-    }
+    $defaults['categories'] = aPeopleTools::getAttribute('categories_filter', array());
 
     $this->form = new aPeopleCategoryForm($defaults);

plugins/apostrophePeoplePlugin/trunk/lib/form/PluginaPeopleCategoryForm.class.php

@@ -7 +7 @@
 
 
-    $categories = Doctrine_Query::create()
-      ->from('aCategory INDEXBY id')
-      ->select('name')
-      ->fetchArray();
+    $categories = $this->getCategoryQuery()->fetchArray();
 
     $choices = array();
@@ -24 +21 @@
     $this->widgetSchema->setNameFormat('aPeopleCategoryFilter[%s]');
   }
+
+  public function getCategoryQuery()
+  {
+    return Doctrine_Query::create()
+      ->from('aCategory INDEXBY id')
+      ->select('name');
+  }
 }

plugins/apostrophePeoplePlugin/trunk/modules/aPeople/templates/indexSuccess.php

@@ -5 +5 @@
         <div class="a-subnav-inner">
                 <h4 class="filter-title">Filter By</h4>
-                <?php include_component('aPeople', 'sidebar', array('defaultCategories' => $defaultCategories)) ?>
+                <?php include_component('aPeople', 'sidebar', array()) ?>
         </div>
 </div>