From fbd5f0e785c39071b5172dc2ff6a9c27ed8116cb Mon Sep 17 00:00:00 2001 From: Christophe Matthieu Date: Mon, 25 Nov 2013 17:24:18 +0100 Subject: [PATCH] [FIX] website_event_track: small fixes bzr revid: chm@openerp.com-20131125162418-eu2xzbf2br34bcfs --- addons/website_event_track/controllers/event.py | 16 ++++------------ addons/website_event_track/models/event.py | 2 +- .../website_event_track/views/website_event.xml | 13 +++++++++++-- 3 files changed, 16 insertions(+), 15 deletions(-) diff --git a/addons/website_event_track/controllers/event.py b/addons/website_event_track/controllers/event.py index 4e74e4ac7cf..fb2805c8e6c 100644 --- a/addons/website_event_track/controllers/event.py +++ b/addons/website_event_track/controllers/event.py @@ -21,19 +21,11 @@ from openerp.addons.web import http from openerp.addons.web.http import request -from openerp.tools.translate import _ -from openerp.addons import website_sale from openerp.addons.website.models import website from openerp.addons.website.controllers.main import Website as controllers controllers = controllers() - -from datetime import datetime, timedelta -from dateutil.relativedelta import relativedelta -from openerp import tools -import urllib - class website_event(http.Controller): @website.route(['/event//track/'], type='http', auth="public", multilang=True) def event_track_view(self, event, track, **post): @@ -45,7 +37,7 @@ class website_event(http.Controller): '/event//track/', '/event//track/tag/' ], type='http', auth="public", multilang=True) - def event_tracks(self, event, tag, **post): + def event_tracks(self, event, tag=None, **post): if tag: track_obj = request.registry.get('event.track') track_ids = track_obj.search(request.cr, request.uid, @@ -67,11 +59,11 @@ class website_event(http.Controller): return request.website.render("website_event_track.event_home", values) @website.route(['/event//track_proposal/'], type='http', auth="public", multilang=True) - def event_detail(self, event, **post): + def event_track_proposal(self, event, **post): values = { 'event': event } return request.website.render("website_event_track.event_track_proposal", values) @website.route(['/event//track_proposal/success/'], type='http', auth="public", multilang=True) - def event_detail(self, event, **post): + def event_track_proposal_success(self, event, **post): values = { 'event': event } - return "" + return request.website.render("website_event_track.event_track_proposal_success", values) diff --git a/addons/website_event_track/models/event.py b/addons/website_event_track/models/event.py index 13a86631dd3..0b6f5b157fa 100644 --- a/addons/website_event_track/models/event.py +++ b/addons/website_event_track/models/event.py @@ -123,7 +123,7 @@ class event_event(osv.osv): context = context or {} result = super(event_event, self)._get_new_menu_pages(cr, uid, event, context=context) if event.show_tracks: - result.append( (_('Agenda'), '/event/%s/tracks/' % event.id)) + result.append( (_('Agenda'), '/event/%s/track/' % event.id)) if event.blog_id: result.append( (_('News'), '/blog/cat/'+str(event.blog_ig.id))) if event.show_track_proposal: diff --git a/addons/website_event_track/views/website_event.xml b/addons/website_event_track/views/website_event.xml index dbf58a1075f..e13d50d11fd 100644 --- a/addons/website_event_track/views/website_event.xml +++ b/addons/website_event_track/views/website_event.xml @@ -43,10 +43,10 @@