[Mpuls-commits] r1206 - wasko/branches/2.0/waskaweb/config

[scm-commit@wald.intevation.org]

Author: torsten
Date: 2010-02-03 10:57:11 +0100 (Wed, 03 Feb 2010)
New Revision: 1206

Modified:
   wasko/branches/2.0/waskaweb/config/routing.py
Log:
* waskaweb/config/routing.py (make_map): Removed old unused routes 


Modified: wasko/branches/2.0/waskaweb/config/routing.py
===================================================================
--- wasko/branches/2.0/waskaweb/config/routing.py	2010-02-03 09:54:57 UTC (rev 1205)
+++ wasko/branches/2.0/waskaweb/config/routing.py	2010-02-03 09:57:11 UTC (rev 1206)
@@ -37,35 +37,16 @@
 
     # The ErrorController route (handles 404/500 error pages); it should
     # likely stay at the top, ensuring it can always be resolved
-    map.connect('error/:action/:id', controller='error')
+    map.connect('/error/{action}', controller='error')
+    map.connect('/error/{action}/{id}', controller='error')
 
     # CUSTOM ROUTES HERE
-    # TAKE CARE OF ORDER HERE!!! FIRST RULE THAT MATCH WILL BE USED!
-    map.connect('', controller='waska', action='index')
-    map.connect('casedocument/delete/:id/:case/:confirmed', action="delete", controller="casedocument") 
-    map.connect('case/markForDelete/:id/:confirmed', controller="case", action="markForDelete")
-    map.connect('case/deleteAppointment/:id/:confirmed', controller="case", action="deleteAppointment")
-    map.connect('case/delete/:id/:confirmed', controller="case", action="delete")
-    map.connect('case/restore/:id/:confirmed', controller="case", action="restore")
-    map.connect('case/select/:id/:confirmed', controller="case", action="select")
-    map.connect('case/select_item/:key_id', controller="case", action="select_item")
-    map.connect('case/keepActive/:id/:confirmed', controller="case", action="keepActive")
-    map.connect('case/phase/:id/:confirmed', controller="case", action="phase")
-    map.connect('case/printAll/:id/:empty', controller="case", action="printAll", empty=0)
-    map.connect('case/anonymize/:id/:confirmed', controller="case", action="anonymize")
-    map.connect('case/markForAnonymize/:id/:confirmed', controller="case", action="markForAnonymize")
-    map.connect('case/markForAnonymizeFromOverview/:id/:confirmed', controller="case", action="markForAnonymizeFromOverview")
-    map.connect('navigation/open_branch/:id', controller="navigation", action="open_branch")
-    map.connect('navigation/close_branch/:id', controller="navigation", action="close_branch")
-    map.connect('navigation/select_branch/:id', controller="navigation", action="select_branch")
 
-    map.connect('digest', 'case/digest/:id', controller="case", action="digest")
-    map.connect('case/logbook/:id/:sort_field/:sort_order', controller="case", action="logbook", sort_field='datum', sort_order='desc') #sorting of logbookentries
-    map.connect('case_overview/overview/:reset/:sort_field/:sort_order', controller="case_overview", action="overview", reset=0, sort_field="name_1", sort_order="asc") #for bundles actions in case_overview
-    map.connect('case_overview/:action/:confirmed', controller="case_overview") #for bundles actions in case_overview
-    map.connect(':controller/:action/:id/:confirmed')
-    map.connect(':controller/:action/:id')
-    map.connect(':controller/:action/*(file).csv')
-    map.connect('*url', controller='template', action='view')
+    map.connect('/', controller='waska', action='index')
+    map.connect('/{controller}', action='index')
+    map.connect('/{controller}/{action}')
+    map.connect('/{controller}/{action}/{id}')
+    map.connect('/{controller}/{action}/{id}/{confirmed}')
+    map.connect('/{controller}/{action}/{id}/*url') # used for dowloading files
 
     return map