diff options
| author | Christophe Simonis <chs@odoo.com> | 2017-11-30 18:43:08 +0100 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2017-11-30 18:43:08 +0100 |
| commit | 42264d8dcb7f8d0795c84718d1fc9a5fd1aefd32 (patch) | |
| tree | 216ded7eac5ba06623892aaaece74c586afd4b5e /addons/website_event | |
| parent | e4a281b5a5f7ea44e4f25259b1a84cb0dc437ebc (diff) | |
| parent | 5d7ad2b16cc3ef579a6657822b7c57b07fef4f52 (diff) | |
[MERGE] forward port branch saas-16 up to 5d7ad2b16cc
Diffstat (limited to 'addons/website_event')
| -rw-r--r-- | addons/website_event/controllers/main.py | 2 | ||||
| -rw-r--r-- | addons/website_event/views/event_templates.xml | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/addons/website_event/controllers/main.py b/addons/website_event/controllers/main.py index 4f5a6516720..b9c08b8232e 100644 --- a/addons/website_event/controllers/main.py +++ b/addons/website_event/controllers/main.py @@ -153,7 +153,7 @@ class WebsiteEventController(http.Controller): # page not found values['path'] = re.sub(r"^website_event\.", '', page) values['from_template'] = 'website_event.default_page' # .strip('website_event.') - page = 'website.page_404' + page = 'website.%s' % (request.website.is_publisher() and 'page_404' or '404') return request.render(page, values) diff --git a/addons/website_event/views/event_templates.xml b/addons/website_event/views/event_templates.xml index 8a9ac57d3f4..9a04d4e7e57 100644 --- a/addons/website_event/views/event_templates.xml +++ b/addons/website_event/views/event_templates.xml @@ -542,7 +542,7 @@ <h4 class="modal-title" id="myModalLabel"><strong>Attendees</strong></h4> </div> <div class="modal-body"> - <div class=""> + <div class="container"> <t t-set="counter_type" t-value="1"/> <t t-set="counter" t-value="0"/> <t t-foreach="tickets" t-as="ticket"> |