diff options
| author | bth-openerp <bth@tinyerp.com> | 2013-10-17 18:41:39 +0530 |
|---|---|---|
| committer | bth-openerp <bth@tinyerp.com> | 2013-10-17 18:41:39 +0530 |
| commit | addc2d5f9cefc4c7cd1eb7f3abcc496f2c8eeabe (patch) | |
| tree | 9bcb89044f3ca6854b2942206b73653f52859e84 /addons/website_event | |
| parent | e3d3cf674c461b2d39418b98898e21d32c08a20d (diff) | |
| parent | d5bbf2501a08dd6b0bab0ea4e2e9ff4b0b03fed7 (diff) | |
[MERGE]Merge trunk-website-al.
bzr revid: bth@tinyerp.com-20131017131139-whjjmuin6g9cby9r
Diffstat (limited to 'addons/website_event')
| -rw-r--r-- | addons/website_event/controllers/main.py | 5 | ||||
| -rw-r--r-- | addons/website_event/models/event.py | 3 |
2 files changed, 6 insertions, 2 deletions
diff --git a/addons/website_event/controllers/main.py b/addons/website_event/controllers/main.py index 54091a0fbb2..16b76c58213 100644 --- a/addons/website_event/controllers/main.py +++ b/addons/website_event/controllers/main.py @@ -154,9 +154,10 @@ class website_event(http.Controller): @website.route(['/event/<int:event_id>'], type='http', auth="public", multilang=True) def event(self, event_id=None, **post): event_obj = request.registry['event.event'] + event = event_obj.browse(request.cr, request.uid, event_id, dict(request.context, show_address_only=1)) values = { - 'event_id': event_obj.browse(request.cr, request.uid, event_id, - dict(request.context, show_address_only=1)), + 'event_id': event, + 'main_object': event, 'range': range, 'float': float, } diff --git a/addons/website_event/models/event.py b/addons/website_event/models/event.py index 0362b5845b7..237b0fcead2 100644 --- a/addons/website_event/models/event.py +++ b/addons/website_event/models/event.py @@ -45,6 +45,9 @@ class event(osv.osv): string='Website Messages', help="Website communication history", ), + 'website_meta_title': fields.char("Website meta title", size=70, translate=True), + 'website_meta_description': fields.text("Website meta description", size=160, translate=True), + 'website_meta_keywords': fields.char("Website meta keywords", translate=True), } _defaults = { 'website_published': False, |