[FIX] website_event_track: small fixes

bzr revid: chm@openerp.com-20131125162418-eu2xzbf2br34bcfs
This commit is contained in:
Christophe Matthieu 2013-11-25 17:24:18 +01:00
parent 97fb6198dd
commit fbd5f0e785
3 changed files with 16 additions and 15 deletions

View File

@ -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/<model("event.event"):event>/track/<model("event.track"):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/<model("event.event"):event>/track/',
'/event/<model("event.event"):event>/track/tag/<model("event.track.tag"):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/<model("event.event"):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/<model("event.event"):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)

View File

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

View File

@ -43,10 +43,10 @@
<div class="col-md-3 css_noprint">
<ul class="nav nav-pills nav-stacked">
<li t-att-class="'' if searches.get('tag') else 'active'"><a t-href="/event/#{ event.id }/tracks/">All</a></li>
<li t-att-class="'' if searches.get('tag') else 'active'"><a t-href="/event/#{ event.id }/track/">All</a></li>
<t t-foreach="tags" t-as="tag">
<li t-att-class="searches.get('tag') == tag.id and 'active' or ''">
<a t-href="/event/#{ event.id }/tracks/tag/#{ tag.id }">
<a t-href="/event/#{ event.id }/track/tag/#{ tag.id }">
<t t-esc="tag.name"/>
</a>
</li>
@ -220,5 +220,14 @@
<div class="oe_structure"/>
</t>
</template>
<template id="event_track_proposal_success">
<t t-call="website_event.layout">
<div class="container">
Thanks
</div>
</t>
</template>
</data>
</openerp>