Do initial category selection based on category parameter

midasplatform · Feb 24, 2012 · aa0c69a · aa0c69a
1 parent 4728e00
commit aa0c69a
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 7 deletions.
diff --git a/controllers/IndexController.php b/controllers/IndexController.php
@@ -47,11 +47,13 @@ function indexAction()
     sort($this->view->allCategories);
 
     $avalue = function($k, $a, $default) { return array_key_exists($k, $a) ? $a[$k] : $default; };
+    $params = $this->_getAllParams();
 
-    $this->view->os = $avalue('os', $_GET, '');
-    $this->view->arch = $avalue('arch', $_GET, '');
-    $this->view->release = $avalue('release', $_GET, '');
-    $this->view->revision = $avalue('revision', $_GET, '');
+    $this->view->os = $avalue('os', $params, '');
+    $this->view->arch = $avalue('arch', $params, '');
+    $this->view->release = $avalue('release', $params, '');
+    $this->view->revision = $avalue('revision', $params, '');
+    $this->view->category = $avalue('category', $params, '');
     }
 
   /**

diff --git a/public/js/index/index.index.js b/public/js/index/index.index.js
@@ -1,6 +1,5 @@
 var midas = midas || {};
 midas.slicerappstore = midas.slicerappstore || {};
-midas.slicerappstore.category = '';
 
 var json = null;
 
@@ -141,6 +140,7 @@ $(document).ready(function() {
     midas.slicerappstore.arch = json.arch;
     midas.slicerappstore.release = json.release;
     midas.slicerappstore.revision = json.revision;
+    midas.slicerappstore.category = json.category;
 
     if(json.slicerView) {
         createNotice = function() {}; //dummy function definition to prevent exceptions
@@ -180,7 +180,7 @@ $(document).ready(function() {
         midas.slicerappstore.selectedCategory = $(this);
         $(this).addClass('selectedCategory');
         midas.slicerappstore.applyFilter();
-    }).addClass('selectedCategory');
+    });
 
     // Enable filtering by specific categories
     $('li.categoryControl').click(function() {
@@ -191,6 +191,11 @@ $(document).ready(function() {
         midas.slicerappstore.applyFilter();
     });
 
+    var selector = midas.slicerappstore.category == '' ?
+        'li#categoryAll' :
+        'li.categoryControl[name="'+midas.slicerappstore.category+'"]';
+    midas.slicerappstore.selectedCategory = $(selector).addClass('selectedCategory');
+
     // Fetch our results based on the initial settings
     midas.slicerappstore.applyFilter();
 });
diff --git a/views/index/index.phtml b/views/index/index.phtml
@@ -127,6 +127,7 @@ else
                          'os' => $this->os,
                          'arch' => $this->arch,
                          'release' => $this->release,
-                         'revision' => $this->revision));
+                         'revision' => $this->revision,
+                         'category' => $this->category));
   ?>
 </div>