From c2a38e460282a8da6e1cec9839d3f5d7caa727da Mon Sep 17 00:00:00 2001 From: qmo-odoo Date: Fri, 8 Feb 2019 08:06:44 +0000 Subject: [PATCH 1/5] [IMP] website_slides: create channel in frontend This commit provides the abilty to create channel from the website instead of creating a slide. To do so, the user still have the "upload" button on the channel home page. The new modal allow user to set title, description, type and channel tags. We prevent channel tag and group tag creation on the fly, as it can impact the UI (coming in a future commits). Task-1938643 --- .../views/website_navbar_templates.xml | 6 +- addons/website_slides/controllers/main.py | 25 ++++ addons/website_slides/models/slide_channel.py | 1 + .../static/src/js/website_slides.editor.js | 119 ++++++++++++------ .../static/src/xml/website_slides_channel.xml | 51 ++++++++ .../views/slide_channel_views.xml | 3 +- 6 files changed, 165 insertions(+), 40 deletions(-) create mode 100644 addons/website_slides/static/src/xml/website_slides_channel.xml diff --git a/addons/website/views/website_navbar_templates.xml b/addons/website/views/website_navbar_templates.xml index 34623a7c3a1..1c65928f56b 100644 --- a/addons/website/views/website_navbar_templates.xml +++ b/addons/website/views/website_navbar_templates.xml @@ -147,15 +147,15 @@
- + -

New Slide

+

New Slide Channel
-

New Channel

+

New Livechat Channel
diff --git a/addons/website_slides/controllers/main.py b/addons/website_slides/controllers/main.py index 3ea51a7395e..49b01f1b3b1 100644 --- a/addons/website_slides/controllers/main.py +++ b/addons/website_slides/controllers/main.py @@ -183,6 +183,23 @@ class WebsiteSlides(http.Controller): return request.render('website_slides.home', values) + @http.route(['/slides/channel/add'], type='http', auth='user', methods=['POST'], website=True) + def slide_channel_create(self, *args, **kw): + # `tag_ids` is a string representing a list of int with coma. i.e.: '2,5,7' + # We don't want to allow user to create tags and tag groups on the fly. + tag_ids = [] + if kw.get('tag_ids'): + tag_ids = [int(item) for item in kw['tag_ids'].split(',')] + + channel = request.env['slide.channel'].create({ + 'name': kw['name'], + 'description': kw.get('description'), + 'channel_type': kw.get('channel_type', 'documentation'), + 'user_id': request.env.user.id, + 'tag_ids': [(6, 0, tag_ids)], + }) + return werkzeug.utils.redirect("/slides/%s" % (slug(channel))) + # -------------------------------------------------- # SLIDE.SLIDE CONTOLLERS # -------------------------------------------------- @@ -319,6 +336,14 @@ class WebsiteSlides(http.Controller): return {'error': _('Internal server error, please try again later or contact administrator.\nHere is the error message: %s') % e} return {'url': "/slides/slide/%s" % (slide.id)} + @http.route(['/slides/channel/tag/search_read'], type='json', auth='user', methods=['POST'], website=True) + def slide_channel_tag_search_read(self, fields, domain): + can_create = request.env['slide.channel.tag'].check_access_rights('create', raise_exception=False) + return { + 'read_results': request.env['slide.channel.tag'].search_read(domain, fields), + 'can_create': can_create, + } + @http.route(['/slides/tag/search_read'], type='json', auth='user', methods=['POST'], website=True) def slide_tag_search_read(self, fields, domain): can_create = request.env['slide.tag'].check_access_rights('create', raise_exception=False) diff --git a/addons/website_slides/models/slide_channel.py b/addons/website_slides/models/slide_channel.py index c2e653411c1..eea0fb04a71 100644 --- a/addons/website_slides/models/slide_channel.py +++ b/addons/website_slides/models/slide_channel.py @@ -67,6 +67,7 @@ class Channel(models.Model): ('documentation', 'Documentation'), ('training', 'Training')], string="Course type", default="documentation", required=True) sequence = fields.Integer(default=10, help='Display order') + user_id = fields.Many2one('res.users', string='Responsible', default=lambda self: self.env.uid) tag_ids = fields.Many2many( 'slide.channel.tag', 'slide_channel_tag_rel', 'channel_id', 'tag_id', string='Tags', help='Used to categorize and filter displayed channels/courses') diff --git a/addons/website_slides/static/src/js/website_slides.editor.js b/addons/website_slides/static/src/js/website_slides.editor.js index 2d4f0ee8992..40513e785e2 100644 --- a/addons/website_slides/static/src/js/website_slides.editor.js +++ b/addons/website_slides/static/src/js/website_slides.editor.js @@ -8,12 +8,83 @@ var WebsiteNewMenu = require('website.newMenu'); var _t = core._t; + +var ChannelCreateDialog = Dialog.extend({ + template: 'website.slide.channel.create', + /** + * @override + * @param {Object} parent + * @param {Object} options + */ + init: function (parent, options) { + options = _.defaults(options || {}, { + title: _t("New Channel Slide"), + size: 'medium', + buttons: [{ + text: _t("Create"), + classes: 'btn-primary', + click: this._onClickFormSubmit.bind(this) + }, { + text: _t("Discard"), + close: true + },] + }); + this._super(parent, options); + }, + start: function () { + var self = this; + return this._super.apply(this, arguments).then(function () { + var $input = self.$('#tag_ids'); + $input.select2({ + width: '100%', + allowClear: true, + formatNoMatches: false, + multiple: true, + selection_data: false, + fill_data: function (query, data) { + var that = this, + tags = {results: []}; + _.each(data, function (obj) { + if (that.matcher(query.term, obj.name)) { + tags.results.push({id: obj.id, text: obj.name}); + } + }); + query.callback(tags); + }, + query: function (query) { + var that = this; + // fetch data only once and store it + if (!this.selection_data) { + self._rpc({ + route: '/slides/channel/tag/search_read', + params: { + fields: ['name'], + domain: [], + } + }).then(function (data) { + that.can_create = data.can_create; + that.fill_data(query, data.read_results); + that.selection_data = data.read_results; + }); + } else { + this.fill_data(query, this.selection_data); + } + } + }); + }); + }, + _onClickFormSubmit: function (ev) { + var $form = this.$("#slide_channel_add_form"); + $form.submit() + }, +}); + WebsiteNewMenu.include({ actions: _.extend({}, WebsiteNewMenu.prototype.actions || {}, { - new_slide: '_createNewSlide', + new_slide_channel: '_createNewSlideChannel', }), xmlDependencies: WebsiteNewMenu.prototype.xmlDependencies.concat( - ['/website_slides/static/src/xml/website_slides.xml'] + ['/website_slides/static/src/xml/website_slides_channel.xml'] ), //-------------------------------------------------------------------------- @@ -21,44 +92,20 @@ WebsiteNewMenu.include({ //-------------------------------------------------------------------------- /** - * Asks the user information about in which channel to create a new slide, - * and redirects the user to this channel with the "new slide" popup open. + * Displays the popup to create a new slide channel, + * and redirects the user to this channel. * * @private * @returns {Deferred} Unresolved if there is a redirection */ - _createNewSlide: function () { - var self = this; - return this._rpc({ - model: 'slide.channel', - method: 'list_all', - args: [[]], - }).then(function (data) { - var def = $.Deferred(); - new Dialog(self, { - title: _t("New slide"), - subtitle: _t("On which channel do you want to add a slide?"), - size: 'medium', - $content: QWeb.render('website.slide.create', data), - buttons: [{ - text: _t("Select"), - classes: 'btn-primary', - click: function () { - var channel_url = this.$("option:selected").val(); - if (channel_url) { - window.location.href = channel_url + '?enable_slide_upload'; - } else { - def.reject(); - } - } - }, { - text: _t("Cancel"), close: true - },] - }).open() - .on('closed', def.resolve.bind(def)); - - return def; + _createNewSlideChannel: function () { + var def = $.Deferred(); + var dialog = new ChannelCreateDialog(this, {}); + dialog.open(); + dialog.on('closed', this, function() { + def.resolve(); }); - }, + return def; + }, }); }); diff --git a/addons/website_slides/static/src/xml/website_slides_channel.xml b/addons/website_slides/static/src/xml/website_slides_channel.xml new file mode 100644 index 00000000000..525b55fd1ff --- /dev/null +++ b/addons/website_slides/static/src/xml/website_slides_channel.xml @@ -0,0 +1,51 @@ + + + + + +
+
+ +
+ +
+ +
+
+
+
+ Type +
+
+ + +
+
+ + +
+
+
+
+
+ +
+ -
-
- -
- -
- - - - -
-
- - - - - -
-
- -
- -
-
-
- - - diff --git a/addons/website_slides/static/src/xml/website_slides_upload.xml b/addons/website_slides/static/src/xml/website_slides_upload.xml new file mode 100644 index 00000000000..c43616638f1 --- /dev/null +++ b/addons/website_slides/static/src/xml/website_slides_upload.xml @@ -0,0 +1,132 @@ + + + + +
+
+ +
+
+ + + + +
+ + + +
+ + +
+ +
+ + + + + + + + + +
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+ + + + +
+
+
+
+
+
+ Content Preview +
+
+
+
+
    +
  • +
    + +
    + + +
    • +
+
+
+ + + +
+ + + +
+
+ + +
+ + + +
+
+
+
+
+
+ Content Preview +
+
+
+
+
    +
  • +
    + +
    + +
    • +
+
+
+ + + +
+ + +