Author: jablko
Date: Tue Oct 26 18:25:57 2010
New Revision: 8526

Log:
Use generic routes

Modified:
   trunk/apps/qubit/config/routing.yml

Modified: trunk/apps/qubit/config/routing.yml
==============================================================================
--- trunk/apps/qubit/config/routing.yml Tue Oct 26 17:12:13 2010        (r8525)
+++ trunk/apps/qubit/config/routing.yml Tue Oct 26 18:25:57 2010        (r8526)
@@ -211,32 +211,6 @@
     action: edit
     informationobject_template: rad
 
-indexAclGroup:
-  url:   /:id;aclGroup
-  param:
-    module: aclGroup
-    action: index
-
-id;aclGroup:
-  url: /:id;aclGroup/:action
-  param:
-    module: aclGroup
-    id: { pattern: '[^;]+' }
-
-actorEditContactInformation:
-  url: /:id;actor/editContactInformation
-  param:
-    module: actor
-    action: editContactInformation
-    id: { pattern: \d+ }
-
-settingDelete:
-  url: /:id;settings/delete
-  param:
-    module: settings
-    action: delete
-    id: { pattern: \d+ }
-
 # These routes used only to *generate* not *parse* URLs
 actor:
   url: /:slug;:actor_template
@@ -360,19 +334,6 @@
   param:
     action: index
 
-default_index:
-  url:   /;:module
-  param:
-    action: index
-
-# After default_index to avoid matching /;foo
-slug:
-  url: /:slug
-  class: QubitResourceRoute
-  param:
-    module: staticpage
-    action: index
-
 slug;default:
   url: /:slug;:module/:action
   class: QubitResourceRoute
@@ -381,6 +342,11 @@
   url: /;:module/:action/:id
   class: QubitRoute
 
+default_index:
+  url:   /;:module
+  param:
+    action: index
+
 # After slug;default to avoid matching array($object, 'module' => 'foo', 
'action', => 'edit')
 edit:
   url: /;:module/add
@@ -393,5 +359,13 @@
   param:
     action: add
 
+# After default_index to avoid matching /;foo
+slug:
+  url: /:slug
+  class: QubitResourceRoute
+  param:
+    module: staticpage
+    action: index
+
 default:
   url:   /;:module/:action/*

-- 
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