diff --git a/addons/website/models/website.py b/addons/website/models/website.py index e96da6849b0..3bd49c32aed 100644 --- a/addons/website/models/website.py +++ b/addons/website/models/website.py @@ -546,7 +546,7 @@ class website_menu(osv.osv): def get_menu(self, cr, uid, website_id, context=None): root_domain = [('parent_id', '=', False)] # ('website_id', '=', website_id), - menu_ids = self.search(cr, uid, root_domain, context=context) + menu_ids = self.search(cr, uid, root_domain, order='id', context=context) menu = self.browse(cr, uid, menu_ids, context=context) return menu[0] diff --git a/addons/website_event/controllers/main.py b/addons/website_event/controllers/main.py index a590c579058..a2ac7314c9d 100644 --- a/addons/website_event/controllers/main.py +++ b/addons/website_event/controllers/main.py @@ -163,6 +163,13 @@ class website_event(http.Controller): return request.website.render("website_event.index", values) + @website.route(['/event//page/'], type='http', auth="public", multilang=True) + def event_page(self, event, page, **post): + values = { + 'event': event, + } + return request.website.render(page, values) + @website.route(['/event/'], type='http', auth="public", multilang=True) def event(self, event=None, **post): if event.menu_id and event.menu_id.child_id: diff --git a/addons/website_event/models/event.py b/addons/website_event/models/event.py index aee0110f333..7220f416d80 100644 --- a/addons/website_event/models/event.py +++ b/addons/website_event/models/event.py @@ -46,10 +46,10 @@ class event(osv.osv): web = self.pool.get('website') result = [] for name,path in todo: - name = name+' '+event.name - newpath = web.new_page(cr, uid, name, path, ispage=False, context=context) - url = "/event/event.id/page/" + newpath - result.append((name, newpath)) + name2 = name+' '+event.name + newpath = web.new_page(cr, uid, name2, path, ispage=False, context=context) + url = "/event/"+str(event.id)+"/page/" + newpath + result.append((name, url)) return result def _set_show_menu(self, cr, uid, ids, name, value, arg, context=None): diff --git a/addons/website_event/views/website_event.xml b/addons/website_event/views/website_event.xml index d3f2c89e256..4f13491f59a 100644 --- a/addons/website_event/views/website_event.xml +++ b/addons/website_event/views/website_event.xml @@ -72,7 +72,7 @@

- + not published

@@ -172,7 +172,7 @@
    -
  1. All Events
    2. +
  2. All Events
    4. diff --git a/addons/website_event_track/controllers/event.py b/addons/website_event_track/controllers/event.py index 944800b98eb..c40625783c5 100644 --- a/addons/website_event_track/controllers/event.py +++ b/addons/website_event_track/controllers/event.py @@ -35,11 +35,27 @@ from openerp import tools import urllib class website_event(http.Controller): - @website.route(['/event/detail/'], type='http', auth="public", multilang=True) - def event_detail(self, event=None, **post): + @website.route(['/event/track_view/'], type='http', auth="public", multilang=True) + def event_track_view(self, track, **post): + # TODO: not implemented + values = { 'track': track, 'event': track.event_id} + return request.website.render("website_event_track.track_view", values) + + @website.route(['/event/tracks/'], type='http', auth="public", multilang=True) + def event_tracks(self, event, tag=None, **post): + # TODO: filter on tracks: tags, search keywords values = { 'event': event, + 'tracks': event.track_ids, + 'tags': event.track_tag_ids, + 'searches': {} } + print 'ICI' + return request.website.render("website_event_track.tracks", values) + + @website.route(['/event/detail/'], type='http', auth="public", multilang=True) + def event_detail(self, event, **post): + values = { 'event': event } return request.website.render("website_event_track.event_home", values) @website.route(['/event/track_proposal/'], type='http', auth="public", multilang=True) diff --git a/addons/website_event_track/data/event_demo.xml b/addons/website_event_track/data/event_demo.xml index 3124a901a0e..34b2da55e29 100644 --- a/addons/website_event_track/data/event_demo.xml +++ b/addons/website_event_track/data/event_demo.xml @@ -2,19 +2,28 @@ - - Technical + + Webinar - - Business + + Exhibition - - Lightning Talks - - - Round Table + + Conference + + Technical + + + Business + + + Lightning Talks + + + Round Table + Room 1 @@ -32,6 +41,11 @@ + + True + True + True + True diff --git a/addons/website_event_track/models/event.py b/addons/website_event_track/models/event.py index 2947ea8d645..bd071d63e61 100644 --- a/addons/website_event_track/models/event.py +++ b/addons/website_event_track/models/event.py @@ -88,7 +88,7 @@ class event_track(osv.osv): 'show_attachments': lambda self, cr, uid, ctx: True, 'duration': lambda *args: 0, 'stage_id': _default_stage_id, - 'priority': 3 + 'priority': '2' } def _read_group_stage_ids(self, cr, uid, ids, domain, read_group_order=None, access_rights_uid=None, context=None): stage_obj = self.pool.get('event.track.stage') @@ -122,9 +122,11 @@ class event_event(osv.osv): def _get_new_menu_pages(self, cr, uid, event, context=None): 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/tracks/'+str(event.id))) if event.blog_id: - pass + result.append( (_('News'), '/blog/cat/'+str(event.blog_ig.id))) if event.show_track_proposal: - result.append( _('Talk Proposals'), '/event/track_proposal/'+str(event.id)) + result.append( (_('Talk Proposals'), '/event/track_proposal/'+str(event.id))) return result diff --git a/addons/website_event_track/views/website_event.xml b/addons/website_event_track/views/website_event.xml index 6cc2a6ae5fe..82e8c4538eb 100644 --- a/addons/website_event_track/views/website_event.xml +++ b/addons/website_event_track/views/website_event.xml @@ -35,6 +35,56 @@ + + + + + +