Author: jablko
Date: Tue Nov  2 18:51:42 2010
New Revision: 8763

Log:
Drop special information object list route, fixes issue 1825

Modified:
   trunk/apps/qubit/config/routing.yml
   trunk/apps/qubit/modules/informationobject/actions/listAction.class.php

Modified: trunk/apps/qubit/config/routing.yml
==============================================================================
--- trunk/apps/qubit/config/routing.yml Tue Nov  2 16:13:09 2010        (r8762)
+++ trunk/apps/qubit/config/routing.yml Tue Nov  2 18:51:42 2010        (r8763)
@@ -328,14 +328,6 @@
     module: informationobject
     action: edit
 
-informationObject/list:
-  url: /;informationobject/list
-  class: QubitResourceRoute
-  param:
-    module: informationobject
-    action: list
-    id: <?php echo QubitInformationObject::ROOT_ID."\n" ?>
-
 slug;default_index:
   url:   /:slug;:module
   class: QubitResourceRoute

Modified: 
trunk/apps/qubit/modules/informationobject/actions/listAction.class.php
==============================================================================
--- trunk/apps/qubit/modules/informationobject/actions/listAction.class.php     
Tue Nov  2 16:13:09 2010        (r8762)
+++ trunk/apps/qubit/modules/informationobject/actions/listAction.class.php     
Tue Nov  2 18:51:42 2010        (r8763)
@@ -37,7 +37,11 @@
       $request->limit = sfConfig::get('app_hits_per_page');
     }
 
-    $this->resource = $this->getRoute()->resource;
+    $this->resource = 
QubitInformationObject::getById(QubitInformationObject::ROOT_ID);
+    if (isset($this->getRoute()->resource))
+    {
+      $this->resource = $this->getRoute()->resource;
+    }
 
     $search = new QubitSearch;
 

-- 
You received this message because you are subscribed to the Google Groups 
"Qubit Toolkit Commits" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to 
[email protected].
For more options, visit this group at 
http://groups.google.com/group/qubit-commits?hl=en.

Reply via email to