[IMP] sitemap cleaning: events

bzr revid: fp@tinyerp.com-20140511143314-nzn1239l00arbxjq

diff --git a/addons/website_event/controllers/main.py b/addons/website_event/controllers/main.py
index b00e703..9de2933 100644 (file)
--- a/addons/website_event/controllers/main.py
+++ b/addons/website_event/controllers/main.py
@@ -170,7 +170,7 @@ class website_event(http.Controller):
 
         return request.website.render("website_event.index", values)
 
-    @http.route(['/event/<model("event.event"):event>/page/<page:page>'], type='http', auth="public", website=True, multilang=True)
+    @http.route(['/event/<model("event.event"):event>/page/<page:path>'], type='http', auth="public", website=True, multilang=True)
     def event_page(self, event, page, **post):
         values = {
             'event': event,

diff --git a/addons/website_event_track/controllers/event.py b/addons/website_event_track/controllers/event.py
index 60d4bbd..4a3d814 100644 (file)
--- a/addons/website_event_track/controllers/event.py
+++ b/addons/website_event_track/controllers/event.py
@@ -33,7 +33,7 @@ import pytz
 from pytz import timezone
 
 class website_event(http.Controller):
-    @http.route(['/event/<model("event.event"):event>/track/<model("event.track"):track>'], type='http', auth="public", website=True, multilang=True)
+    @http.route(['''/event/<model("event.event"):event>/track/<model("event.track", "[('event_id','=',event[0])]"):track>'''], type='http', auth="public", website=True, multilang=True)
     def event_track_view(self, event, track, **post):
         track_obj = request.registry.get('event.track')
         track = track_obj.browse(request.cr, openerp.SUPERUSER_ID, track.id, context=request.context)
@@ -77,7 +77,7 @@ class website_event(http.Controller):
 
 
     # TODO: not implemented
-    @http.route(['/event/<model("event.event"):event>/agenda'], type='http', auth="public", website=True, multilang=True)
+    @http.route(['''/event/<model("event.event", "[('show_tracks','=',1)]"):event>/agenda'''], type='http', auth="public", website=True, multilang=True)
     def event_agenda(self, event, tag=None, **post):
         comp = lambda x: (x.date, bool(x.location_id))
         event.track_ids.sort(lambda x,y: cmp(comp(x), comp(y)))
@@ -101,8 +101,8 @@ class website_event(http.Controller):
         })
 
     @http.route([
-        '/event/<model("event.event"):event>/track',
-        '/event/<model("event.event"):event>/track/tag/<model("event.track.tag"):tag>'
+        '''/event/<model("event.event", "[('show_tracks','=',1)]"):event>/track''',
+        '''/event/<model("event.event", "[('show_tracks','=',1)]"):event>/track/tag/<model("event.track.tag"):tag>'''
         ], type='http', auth="public", website=True, multilang=True)
     def event_tracks(self, event, tag=None, **post):
         searches = {}
@@ -128,7 +128,7 @@ class website_event(http.Controller):
         }
         return request.website.render("website_event_track.tracks", values)
 
-    @http.route(['/event/<model("event.event"):event>/track_proposal'], type='http', auth="public", website=True, multilang=True)
+    @http.route(['''/event/<model("event.event", "[('show_track_proposal','=',1)]"):event>/track_proposal'''], type='http', auth="public", website=True, multilang=True)
     def event_track_proposal(self, event, **post):
         values = { 'event': event }
         return request.website.render("website_event_track.event_track_proposal", values)