odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[IMP] Event should be editable upon creation 

bzr revid: ddm@openerp.com-20131126132424-irz4fzb4o9nza379
This commit is contained in:
ddm 2013-11-26 14:24:24 +01:00
parent 3731d33852
commit 03f61a078c
2 changed files with 6 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
addons/website_event/controllers/main.py
View File

@ -171,8 +171,12 @@ class website_event(http.Controller):
@website.route(['/event/<model("event.event"):event>'], type='http', auth="public", multilang=True)
def event(self, event=None, **post):
if event.menu_id and event.menu_id.child_id:
return request.redirect(event.menu_id.child_id[0].url)
return request.redirect('/event/%s/register' % str(event.id))
target_url = event.menu_id.child_id[0].url
else:
target_url = '/event/%s/register' % str(event.id)
if post.get('enable_editor') == '1':
target_url += '?enable_editor=1'
return request.redirect(target_url);
@website.route(['/event/<model("event.event"):event>/register'], type='http', auth="public", multilang=True)
def event_register(self, event=None, **post):

10
addons/website_event/static/src/js/website.tour.event.js
View File

@ -67,16 +67,6 @@
content: "This is your new event page. We will edit the event presentation page.",
template: self.popover({ next: "OK" }),
},
{
stepId: 'edit-page',
element: 'button[data-action=edit]',
placement: 'bottom',
title: "Edit the event desciption",
content: "Edit the page to modify the event description.",
triggers: function () {
editor.on('tour:editor_bar_loaded', self, self.moveToNextStep);
},
},
{
stepId: 'add-image-text',
element: 'button[data-action=snippet]',