-
diff --git a/addons/website_slides/controllers/__init__.py b/addons/website_slides/controllers/__init__.py
index 5f151657861..65fe13d06bf 100644
--- a/addons/website_slides/controllers/__init__.py
+++ b/addons/website_slides/controllers/__init__.py
@@ -1,6 +1,5 @@
# -*- coding: utf-8 -*-
# Part of Odoo. See LICENSE file for full copyright and licensing details.
-from . import mail
from . import main
-from . import portal
+from . import mail
diff --git a/addons/website_slides/controllers/mail.py b/addons/website_slides/controllers/mail.py
index 5ec41d9de88..0766536d538 100644
--- a/addons/website_slides/controllers/mail.py
+++ b/addons/website_slides/controllers/mail.py
@@ -1,33 +1,51 @@
# -*- coding: utf-8 -*-
# Part of Odoo. See LICENSE file for full copyright and licensing details.
-import logging
-from odoo.http import request
import werkzeug
+
from werkzeug.exceptions import NotFound, Forbidden
from odoo import http
-from odoo.addons.portal.controllers.mail import _check_special_access
+from odoo.http import request
+from odoo.addons.portal.controllers.mail import _check_special_access, PortalChatter
from odoo.tools import plaintext2html
-_logger = logging.getLogger(__name__)
+class SlidesPortalChatter(PortalChatter):
-class SlidesMail(http.Controller):
+ @http.route(['/mail/chatter_post'], type='http', methods=['POST'], auth='public', website=True)
+ def portal_chatter_post(self, res_model, res_id, message, **kw):
+ result = super(SlidesPortalChatter, self).portal_chatter_post(res_model, res_id, message, **kw)
+ if res_model == 'slide.channel':
+ rating_value = kw.get('rating_value', False)
+ slide_channel = request.env[res_model].sudo().browse(int(res_id))
+ if rating_value and slide_channel and request.env.user.partner_id.id == int(kw.get('pid')):
+ # apply karma gain rule only once
+ request.env.user.add_karma(slide_channel.karma_gen_channel_rank)
+ return result
- @http.route('/slides/mail/update_comment', type='http', auth="user")
- def mail_update_message(self, res_id, message, message_id, **post):
-
- res_model = 'slide.channel' # keep this mecanism intern to slide
- message_body = plaintext2html(message)
+ @http.route([
+ '/slides/mail/update_comment',
+ '/mail/chatter_update',
+ ], type='http', auth="user")
+ def mail_update_message(self, res_model, res_id, message, message_id, redirect=None, attachment_ids='', attachment_tokens='', **post):
+ # keep this mecanism intern to slide currently (saas 12.5) as it is
+ # considered experimental
+ if res_model != 'slide.channel':
+ raise Forbidden()
res_id = int(res_id)
- message_id = int(message_id)
- pid = int(post['pid']) if post.get('pid') else False
+ attachment_ids = [int(attachment_id) for attachment_id in attachment_ids.split(',') if attachment_id]
+ attachment_tokens = [attachment_token for attachment_token in attachment_tokens.split(',') if attachment_token]
+ self._portal_post_check_attachments(attachment_ids, attachment_tokens)
+
+ pid = int(post['pid']) if post.get('pid') else False
if not _check_special_access(res_model, res_id, token=post.get('token'), _hash=post.get('hash'), pid=pid):
raise Forbidden()
- # update mail.message
+ # fetch and update mail.message
+ message_id = int(message_id)
+ message_body = plaintext2html(message)
domain = [
('model', '=', res_model),
('res_id', '=', res_id),
@@ -40,7 +58,8 @@ class SlidesMail(http.Controller):
if not message:
raise NotFound()
message.write({
- 'body': message_body
+ 'body': message_body,
+ 'attachment_ids': [(4, aid) for aid in attachment_ids],
})
# update rating
@@ -51,4 +70,6 @@ class SlidesMail(http.Controller):
'rating': float(post['rating_value'])
})
- return werkzeug.utils.redirect(request.httprequest.referrer, 302)
+ # redirect to specified or referrer or simply channel page as fallback
+ redirect_url = redirect or (request.httprequest.referrer and request.httprequest.referrer + '#review') or '/slides/%s' % res_id
+ return werkzeug.utils.redirect(redirect_url, 302)
diff --git a/addons/website_slides/controllers/main.py b/addons/website_slides/controllers/main.py
index 028be99a530..cd363b1f1e5 100644
--- a/addons/website_slides/controllers/main.py
+++ b/addons/website_slides/controllers/main.py
@@ -2,19 +2,18 @@
# Part of Odoo. See LICENSE file for full copyright and licensing details.
import base64
-import itertools
+import json
import logging
import werkzeug
import math
-from odoo import http, modules, tools, _
-from odoo.exceptions import AccessError, UserError
-from odoo.http import request
-from odoo.osv import expression
-
+from odoo import http, tools, _
from odoo.addons.http_routing.models.ir_http import slug
from odoo.addons.website_profile.controllers.main import WebsiteProfile
from odoo.addons.website.models.ir_http import sitemap_qs2dom
+from odoo.exceptions import AccessError, UserError
+from odoo.http import request
+from odoo.osv import expression
_logger = logging.getLogger(__name__)
@@ -419,18 +418,28 @@ class WebsiteSlides(WebsiteProfile):
'enable_slide_upload': 'enable_slide_upload' in kw,
}
if not request.env.user._is_public():
- last_message_values = request.env['mail.message'].search([
+ last_message = request.env['mail.message'].search([
('model', '=', channel._name),
('res_id', '=', channel.id),
('author_id', '=', request.env.user.partner_id.id),
('message_type', '=', 'comment'),
('website_published', '=', True)
- ], order='write_date DESC', limit=1).read(['body', 'rating_value'])
- last_message_data = last_message_values[0] if last_message_values else {}
+ ], order='write_date DESC', limit=1)
+ if last_message:
+ last_message_values = last_message.read(['body', 'rating_value', 'attachment_ids'])[0]
+ last_message_attachment_ids = last_message_values.pop('attachment_ids', [])
+ if last_message_attachment_ids:
+ last_message_attachment_ids = json.dumps(request.env['ir.attachment'].browse(last_message_attachment_ids).read(
+ ['id', 'name', 'mimetype', 'file_size', 'access_token']
+ ))
+ else:
+ last_message_values = {}
+ last_message_attachment_ids = []
values.update({
- 'last_message_id': last_message_data.get('id'),
- 'last_message': tools.html2plaintext(last_message_data.get('body', '')),
- 'last_rating_value': last_message_data.get('rating_value'),
+ 'last_message_id': last_message_values.get('id'),
+ 'last_message': tools.html2plaintext(last_message_values.get('body', '')),
+ 'last_rating_value': last_message_values.get('rating_value'),
+ 'last_message_attachment_ids': last_message_attachment_ids,
})
if channel.can_review:
values.update({
diff --git a/addons/website_slides/controllers/portal.py b/addons/website_slides/controllers/portal.py
deleted file mode 100644
index ae07dd85f8a..00000000000
--- a/addons/website_slides/controllers/portal.py
+++ /dev/null
@@ -1,20 +0,0 @@
-# -*- coding: utf-8 -*-
-# Part of Odoo. See LICENSE file for full copyright and licensing details.
-
-from odoo import http
-from odoo.http import request
-from odoo.addons.portal.controllers.mail import PortalChatter
-
-
-class SlidesPortalChatter(PortalChatter):
-
- @http.route(['/mail/chatter_post'], type='http', methods=['POST'], auth='public', website=True)
- def portal_chatter_post(self, res_model, res_id, message, **kw):
- result = super(SlidesPortalChatter, self).portal_chatter_post(res_model, res_id, message, **kw)
- if res_model == 'slide.channel':
- rating_value = kw.get('rating_value', False)
- slide_channel = request.env[res_model].sudo().browse(int(res_id))
- if rating_value and slide_channel and request.env.user.partner_id.id == int(kw.get('pid')):
- # apply karma gain rule only once
- request.env.user.add_karma(slide_channel.karma_gen_channel_rank)
- return result
diff --git a/addons/website_slides/views/website_slides_templates_course.xml b/addons/website_slides/views/website_slides_templates_course.xml
index 494b4c78b37..1b92f589a5f 100644
--- a/addons/website_slides/views/website_slides_templates_course.xml
+++ b/addons/website_slides/views/website_slides_templates_course.xml
@@ -147,9 +147,10 @@
-
+
+