diff --git a/addons/website_event_track/controllers/event.py b/addons/website_event_track/controllers/event.py index fd16c1c9c4f..831ffde0729 100644 --- a/addons/website_event_track/controllers/event.py +++ b/addons/website_event_track/controllers/event.py @@ -9,7 +9,7 @@ import re import openerp from openerp.addons.web import http from openerp.addons.web.http import request -from openerp.tools import html_escape as escape +from openerp.tools import html_escape class website_event(http.Controller): @@ -125,44 +125,23 @@ class website_event(http.Controller): def event_track_proposal_post(self, event, **post): cr, uid, context = request.cr, request.uid, request.context - tobj = request.registry['event.track'] - tags = [] for tag in event.allowed_track_tag_ids: if post.get('tag_'+str(tag.id)): tags.append(tag.id) - track_description = '''
-
-
-
-

%s

-
-
-

%s

-
-
-

About The Author

-

%s

-
-
-
-
''' % (escape(post['track_name']), - escape(post['description']), escape(post['biography'])) - - track_id = tobj.create(cr, openerp.SUPERUSER_ID, { + track_obj = request.registry['event.track'] + track_id = track_obj.create(cr, openerp.SUPERUSER_ID, { 'name': post['track_name'], + 'partner_name': post['partner_name'], + 'partner_email': post['email_from'], + 'partner_phone': post['phone'], + 'partner_biography': html_escape(post['biography']), 'event_id': event.id, 'tag_ids': [(6, 0, tags)], 'user_id': False, - 'description': track_description + 'description': html_escape(post['description']), }, context=context) - - tobj.message_post(cr, openerp.SUPERUSER_ID, [track_id], body="""Proposed By: %s
- Mail: %s
- Phone: %s""" % (escape(post['partner_name']), escape(post['email_from']), - escape(post['email_from']), escape(post['phone'])), context=context) - - track = tobj.browse(cr, uid, track_id, context=context) - values = {'track': track, 'event':event} + track = track_obj.browse(cr, uid, track_id, context=context) + values = {'track': track, 'event': event} return request.website.render("website_event_track.event_track_proposal_success", values) diff --git a/addons/website_event_track/data/event_data.xml b/addons/website_event_track/data/event_data.xml index 37a370a2146..c332c99c991 100644 --- a/addons/website_event_track/data/event_data.xml +++ b/addons/website_event_track/data/event_data.xml @@ -14,5 +14,14 @@ Gold 1 + + + + New Track + event.event + New Track Created + + + diff --git a/addons/website_event_track/models/event.py b/addons/website_event_track/models/event.py index 7018f06a4e8..d273d88f0e7 100644 --- a/addons/website_event_track/models/event.py +++ b/addons/website_event_track/models/event.py @@ -32,8 +32,12 @@ class event_track(models.Model): _inherit = ['mail.thread', 'ir.needaction_mixin', 'website.seo.metadata', 'website.published.mixin'] name = fields.Char('Title', required=True, translate=True) - user_id = fields.Many2one('res.users', 'Responsible', track_visibility='onchange', default=lambda self: self.env.user) + partner_id = fields.Many2one('res.partner', 'Proposed by') + partner_name = fields.Char('Partner Name') + partner_email = fields.Char('Partner Email') + partner_phone = fields.Char('Partner Phone') + partner_biography = fields.Html('Partner Biography') speaker_ids = fields.Many2many('res.partner', string='Speakers') tag_ids = fields.Many2many('event.track.tag', string='Tags') state = fields.Selection([ @@ -63,6 +67,23 @@ class event_track(models.Model): def create(self, vals): res = super(event_track, self).create(vals) res.message_subscribe(res.speaker_ids.ids) + res.event_id.message_post(body="""

%(header)s

+""" % { + 'header': _('New Track Proposal'), + 'proposed_by': '%s: %s' % (_('Proposed By'), (res.partner_id.name or res.partner_name or res.partner_email)), + 'mail': '%s: %s' % (_('Mail'), '%s' % (res.partner_email, res.partner_email)), + 'phone': '%s: %s' % (_('Phone'), res.partner_phone), + 'title': '%s: %s' % (_('Title'), res.name), + 'speakers': '%s: %s' % (_('Speakers Biography'), res.partner_biography), + 'introduction': '%s: %s' % (_('Talk Introduction'), res.description), + }, subtype='event.mt_event_track') return res @api.multi diff --git a/addons/website_event_track/views/event_backend.xml b/addons/website_event_track/views/event_backend.xml index 55972ac28e7..aaf1992b165 100644 --- a/addons/website_event_track/views/event_backend.xml +++ b/addons/website_event_track/views/event_backend.xml @@ -113,15 +113,19 @@ - - + + + + + diff --git a/addons/website_event_track/views/website_event.xml b/addons/website_event_track/views/website_event.xml index c6df9113b6a..d3198058241 100644 --- a/addons/website_event_track/views/website_event.xml +++ b/addons/website_event_track/views/website_event.xml @@ -207,14 +207,28 @@
-
+
+
+
+
+

+ Proposed by +

+
+

+

+
+

About The Author

+

+

+
+
+
-