From 8dadb681f45bb80142262ef67a358e6f1331a66b Mon Sep 17 00:00:00 2001 From: Dennis Sluijk Date: Sat, 10 Mar 2018 15:17:23 +0100 Subject: [PATCH 1/7] [11.0][ADD] website_snippet_preset (#414) --- website_snippet_preset/README.rst | 58 ++++++ website_snippet_preset/__init__.py | 4 + website_snippet_preset/__manifest__.py | 24 +++ website_snippet_preset/models/__init__.py | 4 + .../models/snippet_preset.py | 12 ++ .../security/ir.model.access.csv | 3 + .../static/src/css/website_snippet_preset.css | 14 ++ .../static/src/js/website_snippet_preset.js | 183 ++++++++++++++++++ .../static/src/xml/website_snippet_preset.xml | 37 ++++ website_snippet_preset/templates/assets.xml | 13 ++ 10 files changed, 352 insertions(+) create mode 100644 website_snippet_preset/README.rst create mode 100644 website_snippet_preset/__init__.py create mode 100644 website_snippet_preset/__manifest__.py create mode 100644 website_snippet_preset/models/__init__.py create mode 100644 website_snippet_preset/models/snippet_preset.py create mode 100644 website_snippet_preset/security/ir.model.access.csv create mode 100644 website_snippet_preset/static/src/css/website_snippet_preset.css create mode 100644 website_snippet_preset/static/src/js/website_snippet_preset.js create mode 100644 website_snippet_preset/static/src/xml/website_snippet_preset.xml create mode 100644 website_snippet_preset/templates/assets.xml diff --git a/website_snippet_preset/README.rst b/website_snippet_preset/README.rst new file mode 100644 index 0000000000..2c4267041e --- /dev/null +++ b/website_snippet_preset/README.rst @@ -0,0 +1,58 @@ +.. image:: https://img.shields.io/badge/license-AGPL--3-blue.png + :target: https://www.gnu.org/licenses/agpl + :alt: License: AGPL-3 + +======================= +Website Snippet Presets +======================= + +This module allows the user to save and restore presets of snippets. + +Usage +===== + +To use this module, you need to: + +#. Go in editing mode on the website +#. Select a snippet +#. Click 'Presets' +#. Click 'Save Current' +#. Select a different snippet of the same type +#. Select the added preset in the 'Load' menu + +.. image:: https://odoo-community.org/website/image/ir.attachment/5784_f2813bd/datas + :alt: Try me on Runbot + :target: https://runbot.odoo-community.org/runbot/186/11.0 + +Bug Tracker +=========== + +Bugs are tracked on `GitHub Issues +`_. In case of trouble, please +check there if your issue has already been reported. If you spotted it first, +help us smash it by providing detailed and welcomed feedback. + +Credits +======= + +Contributors +------------ + +* Dennis Sluijk + +Do not contact contributors directly about support or help with technical issues. + +Maintainer +---------- + +.. image:: https://odoo-community.org/logo.png + :alt: Odoo Community Association + :target: https://odoo-community.org + +This module is maintained by the OCA. + +OCA, or the Odoo Community Association, is a nonprofit organization whose +mission is to support the collaborative development of Odoo features and +promote its widespread use. + +To contribute to this module, please visit https://odoo-community.org. diff --git a/website_snippet_preset/__init__.py b/website_snippet_preset/__init__.py new file mode 100644 index 0000000000..08c37822e1 --- /dev/null +++ b/website_snippet_preset/__init__.py @@ -0,0 +1,4 @@ +# Copyright 2018 Onestein +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). + +from . import models diff --git a/website_snippet_preset/__manifest__.py b/website_snippet_preset/__manifest__.py new file mode 100644 index 0000000000..ae6c05c871 --- /dev/null +++ b/website_snippet_preset/__manifest__.py @@ -0,0 +1,24 @@ +# Copyright 2018 Onestein +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). + +{ + 'name': 'Website Snippet Presets', + 'summary': 'This module allows the user ' + 'to save and restore presets of snippets.', + 'category': 'Website', + 'version': '11.0.1.0.0', + 'author': 'Onestein, Odoo Community Association (OCA)', + 'license': 'AGPL-3', + 'website': 'https://github.com/OCA/website', + 'depends': [ + 'website' + ], + 'data': [ + 'templates/assets.xml', + 'security/ir.model.access.csv' + ], + 'qweb': [ + 'static/src/xml/website_snippet_preset.xml' + ], + 'installable': True, +} diff --git a/website_snippet_preset/models/__init__.py b/website_snippet_preset/models/__init__.py new file mode 100644 index 0000000000..d8dea76670 --- /dev/null +++ b/website_snippet_preset/models/__init__.py @@ -0,0 +1,4 @@ +# Copyright 2018 Onestein +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). + +from . import snippet_preset diff --git a/website_snippet_preset/models/snippet_preset.py b/website_snippet_preset/models/snippet_preset.py new file mode 100644 index 0000000000..3224812a22 --- /dev/null +++ b/website_snippet_preset/models/snippet_preset.py @@ -0,0 +1,12 @@ +# Copyright 2018 Onestein +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). + +from odoo import models, fields + + +class SnippetPreset(models.Model): + _name = 'snippet.preset' + + snippet = fields.Char() + name = fields.Char() + arch = fields.Text() diff --git a/website_snippet_preset/security/ir.model.access.csv b/website_snippet_preset/security/ir.model.access.csv new file mode 100644 index 0000000000..e9e9d33ee5 --- /dev/null +++ b/website_snippet_preset/security/ir.model.access.csv @@ -0,0 +1,3 @@ +id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink +read,Persission to read presets,model_snippet_preset,website.group_website_publisher,1,0,0,0 +edit,Persission to edit presets,model_snippet_preset,website.group_website_designer,1,1,1,1 diff --git a/website_snippet_preset/static/src/css/website_snippet_preset.css b/website_snippet_preset/static/src/css/website_snippet_preset.css new file mode 100644 index 0000000000..0280e5e75a --- /dev/null +++ b/website_snippet_preset/static/src/css/website_snippet_preset.css @@ -0,0 +1,14 @@ +/* Copyright 2018 Onestein + * License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). */ + +body #oe_manipulators .oe_overlay > .oe_overlay_options { + width: 400px; +} + +.o_snippet_preset_del { + position: absolute; + right: 0px; + top: 0px; + height: 100%; + line-height: 200%; +} diff --git a/website_snippet_preset/static/src/js/website_snippet_preset.js b/website_snippet_preset/static/src/js/website_snippet_preset.js new file mode 100644 index 0000000000..78ecf92142 --- /dev/null +++ b/website_snippet_preset/static/src/js/website_snippet_preset.js @@ -0,0 +1,183 @@ +/* Copyright 2018 Onestein + * License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). */ + +odoo.define('website_snippet_preset', function(require) { + var snippet_editor = require('web_editor.snippet.editor'); + var core = require('web.core'); + var Dialog = require('web.Dialog'); + var qweb = core.qweb; + var _t = core._t; + + snippet_editor.Editor.include({ + xmlDependencies: snippet_editor.Editor.prototype.xmlDependencies.concat( + ['/website_snippet_preset/static/src/xml/website_snippet_preset.xml'] + ), + events: _.extend({}, snippet_editor.Editor.prototype.events, { + 'click .o_snippet_preset_save': 'saveCurrentPreset' + }), + start: function() { + var res = this._super.apply(this, arguments); + this.$preset_menu = this.$('.o_snippet_preset'); + this.$preset_load_menu = this.$('.o_snippet_preset_load'); + this.snippet_name = this.$target.data()['name']; + if(!this.snippet_name) this.$preset_menu.hide(); + this.loadPresets().then(function(records) { + this.renderPresets(records); + }.bind(this)); + return res; + }, + saveCurrentPreset: function() { + var arch = this.$target[0].outerHTML; + var snippet = this.snippet_name; + + var self = this; + var dialog = new EnterNameDialog(this); + dialog.on('save', this, function(name) { + self.presetExists(snippet, name).done(function(exists) { + var save = function() { + self.savePreset(snippet, name, arch, exists); + dialog.close(); + }; + if(exists) { + new OverwriteDialog(dialog).open().done(save); + } else { + save(); + } + }); + }); + dialog.open(); + }, + presetExists: function(snippet, name) { + var self = this; + var get_done = $.Deferred(); + this._rpc({ + model: 'snippet.preset', + method: 'search_read', + domain: [['snippet', '=', snippet], ['name', '=', name]] + }).then(function(records) { + get_done.resolve(records.length == 0 ? false : records[0]['id']); + }); + return get_done.promise(); + }, + deletePreset: function(id) { + var self = this; + return this._rpc({ + model: 'snippet.preset', + method: 'unlink', + args: [[id]] + }).then(function() { + self.loadPresets().then(function(records) { + self.renderPresets(records); + }); + }); + }, + savePreset: function(snippet, name, arch, id) { + var self = this; + var save = null; + if (!id) + save = this._rpc({ + model: 'snippet.preset', + method: 'create', + args: [{arch: arch, name: name, snippet: snippet}] + }); + else + save = this._rpc({ + model: 'snippet.preset', + method: 'write', + args: [[id],{arch: arch}] + }); + + save.then(function() { + self.loadPresets().then(function(records) { + self.renderPresets(records); + }); + }); + return save; + }, + loadPresets: function() { + return this._rpc({ + model: 'snippet.preset', + method: 'search_read', + order: 'name asc', + domain: [['snippet', '=', this.snippet_name]] + }); + }, + renderPreset: function(record) { + var self = this; + var $item = $(qweb.render('website_snippet_preset.Item', {'record': record})); + $item.data('record', record); + $item.click(function() { + self.applyPreset($(this).data('record')['arch']); + }); + $item.find('i').click(function(e) { + self.deletePreset($(this).closest('li').data('record')['id']); + e.stopPropagation(); + }); + this.$preset_load_menu.append($item); + return $item; + }, + renderPresets: function(records) { + this.$preset_load_menu.html(''); + for (var i in records) { + this.renderPreset(records[i]); + } + }, + applyPreset: function(arch) { + var $arch = $(arch); + console.log(arch); + this.$target.html($arch.html()); + this.$target.attr('class', $arch.attr('class')); + this.$target.attr('style', $arch.attr('style')); + this.$target.closest('.o_editable').trigger('content_changed'); + } + }); + + var OverwriteDialog = Dialog.extend({ + init: function(parent) { + var self = this; + this.overwrite = $.Deferred(); + var options = { + title: _t('Overwrite?'), + $content: $(_t('

Preset with this name already exists. Do you want to overwrite it?

')), + buttons: [ + {text: _t("Overwrite"), classes: 'btn-primary', click: this.overwriteClicked.bind(this)}, + {text: _t("No"), classes: 'btn-default', close: true} + ] + }; + return this._super(parent, options); + }, + overwriteClicked: function() { + this.overwrite.resolve(); + this.close(); + }, + open: function() { + this._super.apply(this, arguments); + return this.overwrite.promise(); + } + }); + + var EnterNameDialog = Dialog.extend({ + init: function(parent) { + var self = this; + var options = { + title: _t('Enter Name'), + $content: $(qweb.render('website_snippet_preset.EnterNameDialog', { + name: '' + })), + buttons: [ + {text: _t("Save"), classes: 'btn-primary', click: this.saveClicked.bind(this) }, + {text: _t("Cancel"), classes: 'btn-default', close: true} + ] + }; + return this._super(parent, options); + }, + saveClicked: function() { + this.trigger('save', this.$('input[name="name"]').val()); + } + }); + + return { + 'EnterNameDialog': EnterNameDialog, + 'OverwriteDialog': OverwriteDialog + } +}); diff --git a/website_snippet_preset/static/src/xml/website_snippet_preset.xml b/website_snippet_preset/static/src/xml/website_snippet_preset.xml new file mode 100644 index 0000000000..70cd2f1584 --- /dev/null +++ b/website_snippet_preset/static/src/xml/website_snippet_preset.xml @@ -0,0 +1,37 @@ + + + + diff --git a/website_snippet_preset/templates/assets.xml b/website_snippet_preset/templates/assets.xml new file mode 100644 index 0000000000..b394197c8e --- /dev/null +++ b/website_snippet_preset/templates/assets.xml @@ -0,0 +1,13 @@ + + + + + + From c76f9f5677fe50d8e53378b5bacc5babb63717f7 Mon Sep 17 00:00:00 2001 From: oca-travis Date: Wed, 20 Jun 2018 23:12:39 +0000 Subject: [PATCH 2/7] [UPD] Update website_snippet_preset.pot --- .../i18n/website_snippet_preset.pot | 143 ++++++++++++++++++ 1 file changed, 143 insertions(+) create mode 100644 website_snippet_preset/i18n/website_snippet_preset.pot diff --git a/website_snippet_preset/i18n/website_snippet_preset.pot b/website_snippet_preset/i18n/website_snippet_preset.pot new file mode 100644 index 0000000000..f7fef90ae0 --- /dev/null +++ b/website_snippet_preset/i18n/website_snippet_preset.pot @@ -0,0 +1,143 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * website_snippet_preset +# +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 11.0\n" +"Report-Msgid-Bugs-To: \n" +"Last-Translator: <>\n" +"Language-Team: \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Plural-Forms: \n" + +#. module: website_snippet_preset +#. openerp-web +#: code:addons/website_snippet_preset/static/src/js/website_snippet_preset.js:141 +#, python-format +msgid "

Preset with this name already exists. Do you want to overwrite it?

" +msgstr "" + +#. module: website_snippet_preset +#: model:ir.model.fields,field_description:website_snippet_preset.field_snippet_preset_arch +msgid "Arch" +msgstr "" + +#. module: website_snippet_preset +#. openerp-web +#: code:addons/website_snippet_preset/static/src/js/website_snippet_preset.js:169 +#, python-format +msgid "Cancel" +msgstr "" + +#. module: website_snippet_preset +#: model:ir.model.fields,field_description:website_snippet_preset.field_snippet_preset_create_uid +msgid "Created by" +msgstr "" + +#. module: website_snippet_preset +#: model:ir.model.fields,field_description:website_snippet_preset.field_snippet_preset_create_date +msgid "Created on" +msgstr "" + +#. module: website_snippet_preset +#: model:ir.model.fields,field_description:website_snippet_preset.field_snippet_preset_display_name +msgid "Display Name" +msgstr "" + +#. module: website_snippet_preset +#. openerp-web +#: code:addons/website_snippet_preset/static/src/js/website_snippet_preset.js:163 +#, python-format +msgid "Enter Name" +msgstr "" + +#. module: website_snippet_preset +#: model:ir.model.fields,field_description:website_snippet_preset.field_snippet_preset_id +msgid "ID" +msgstr "" + +#. module: website_snippet_preset +#: model:ir.model.fields,field_description:website_snippet_preset.field_snippet_preset___last_update +msgid "Last Modified on" +msgstr "" + +#. module: website_snippet_preset +#: model:ir.model.fields,field_description:website_snippet_preset.field_snippet_preset_write_uid +msgid "Last Updated by" +msgstr "" + +#. module: website_snippet_preset +#: model:ir.model.fields,field_description:website_snippet_preset.field_snippet_preset_write_date +msgid "Last Updated on" +msgstr "" + +#. module: website_snippet_preset +#. openerp-web +#: code:addons/website_snippet_preset/static/src/xml/website_snippet_preset.xml:13 +#, python-format +msgid "Load" +msgstr "" + +#. module: website_snippet_preset +#. openerp-web +#: code:addons/website_snippet_preset/static/src/xml/website_snippet_preset.xml:32 +#: model:ir.model.fields,field_description:website_snippet_preset.field_snippet_preset_name +#, python-format +msgid "Name" +msgstr "" + +#. module: website_snippet_preset +#. openerp-web +#: code:addons/website_snippet_preset/static/src/js/website_snippet_preset.js:144 +#, python-format +msgid "No" +msgstr "" + +#. module: website_snippet_preset +#. openerp-web +#: code:addons/website_snippet_preset/static/src/js/website_snippet_preset.js:143 +#, python-format +msgid "Overwrite" +msgstr "" + +#. module: website_snippet_preset +#. openerp-web +#: code:addons/website_snippet_preset/static/src/js/website_snippet_preset.js:140 +#, python-format +msgid "Overwrite?" +msgstr "" + +#. module: website_snippet_preset +#. openerp-web +#: code:addons/website_snippet_preset/static/src/xml/website_snippet_preset.xml:9 +#, python-format +msgid "Presets" +msgstr "" + +#. module: website_snippet_preset +#. openerp-web +#: code:addons/website_snippet_preset/static/src/js/website_snippet_preset.js:168 +#, python-format +msgid "Save" +msgstr "" + +#. module: website_snippet_preset +#. openerp-web +#: code:addons/website_snippet_preset/static/src/xml/website_snippet_preset.xml:11 +#, python-format +msgid "Save Current" +msgstr "" + +#. module: website_snippet_preset +#: model:ir.model.fields,field_description:website_snippet_preset.field_snippet_preset_snippet +msgid "Snippet" +msgstr "" + +#. module: website_snippet_preset +#: model:ir.model,name:website_snippet_preset.model_snippet_preset +msgid "snippet.preset" +msgstr "" + From cf731e7b303949836344978257c5187eed4a36bd Mon Sep 17 00:00:00 2001 From: OCA-git-bot Date: Wed, 3 Apr 2019 03:30:58 +0000 Subject: [PATCH 3/7] [ADD] icon.png --- .../static/description/icon.png | Bin 0 -> 9455 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 website_snippet_preset/static/description/icon.png diff --git a/website_snippet_preset/static/description/icon.png b/website_snippet_preset/static/description/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..3a0328b516c4980e8e44cdb63fd945757ddd132d GIT binary patch literal 9455 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 z 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 Xviia!U7SGha1wx#SCgwmn*{w2TRX*I literal 0 HcmV?d00001 From d9c3297725bfaa913da2b8984698da29f396ff6c Mon Sep 17 00:00:00 2001 From: tbaden Date: Thu, 9 May 2019 18:34:44 +0200 Subject: [PATCH 4/7] [FIX][11.0][WIP] website_snippet_preset travis warning --- .../static/src/js/website_snippet_preset.js | 203 ++++++++++-------- 1 file changed, 114 insertions(+), 89 deletions(-) diff --git a/website_snippet_preset/static/src/js/website_snippet_preset.js b/website_snippet_preset/static/src/js/website_snippet_preset.js index 78ecf92142..806465c087 100644 --- a/website_snippet_preset/static/src/js/website_snippet_preset.js +++ b/website_snippet_preset/static/src/js/website_snippet_preset.js @@ -1,44 +1,112 @@ /* Copyright 2018 Onestein * License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). */ -odoo.define('website_snippet_preset', function(require) { +odoo.define('website_snippet_preset', function (require) { + 'use strict'; var snippet_editor = require('web_editor.snippet.editor'); var core = require('web.core'); var Dialog = require('web.Dialog'); var qweb = core.qweb; var _t = core._t; + var OverwriteDialog = Dialog.extend({ + init: function (parent) { + this.overwrite = $.Deferred(); + var options = { + title: _t('Overwrite?'), + $content: $(_t( + '

Preset with this name already exists.' + + 'Do you want to overwrite it?

' + )), + buttons: [ + { + text: _t("Overwrite"), + classes: 'btn-primary', + click: this.overwriteClicked.bind(this), + }, + { + text: _t("No"), + classes: 'btn-default', + close: true, + }, + ], + }; + return this._super(parent, options); + }, + overwriteClicked: function () { + this.overwrite.resolve(); + this.close(); + }, + open: function () { + this._super.apply(this, arguments); + return this.overwrite.promise(); + }, + }); + + var EnterNameDialog = Dialog.extend({ + init: function (parent) { + var options = { + title: _t('Enter Name'), + $content: $(qweb + .render('website_snippet_preset.EnterNameDialog', { + name: '', + })), + buttons: [ + { + text: _t("Save"), + classes: 'btn-primary', + click: this.saveClicked.bind(this), + }, + { + text: _t("Cancel"), + classes: 'btn-default', + close: true, + }, + ], + }; + return this._super(parent, options); + }, + saveClicked: function () { + this.trigger('save', this.$('input[name="name"]').val()); + }, + }); snippet_editor.Editor.include({ - xmlDependencies: snippet_editor.Editor.prototype.xmlDependencies.concat( - ['/website_snippet_preset/static/src/xml/website_snippet_preset.xml'] - ), + xmlDependencies: snippet_editor.Editor + .prototype.xmlDependencies.concat( + [ + '/website_snippet_preset/static/' + + 'src/xml/website_snippet_preset.xml', + ] + ), events: _.extend({}, snippet_editor.Editor.prototype.events, { - 'click .o_snippet_preset_save': 'saveCurrentPreset' + 'click .o_snippet_preset_save': 'saveCurrentPreset', }), - start: function() { + start: function () { var res = this._super.apply(this, arguments); this.$preset_menu = this.$('.o_snippet_preset'); this.$preset_load_menu = this.$('.o_snippet_preset_load'); - this.snippet_name = this.$target.data()['name']; - if(!this.snippet_name) this.$preset_menu.hide(); - this.loadPresets().then(function(records) { + this.snippet_name = this.$target.data().name; + if (!this.snippet_name) { + this.$preset_menu.hide(); + } + this.loadPresets().then(function (records) { this.renderPresets(records); }.bind(this)); return res; }, - saveCurrentPreset: function() { + saveCurrentPreset: function () { var arch = this.$target[0].outerHTML; var snippet = this.snippet_name; var self = this; var dialog = new EnterNameDialog(this); - dialog.on('save', this, function(name) { - self.presetExists(snippet, name).done(function(exists) { - var save = function() { + dialog.on('save', this, function (name) { + self.presetExists(snippet, name).done(function (exists) { + var save = function () { self.savePreset(snippet, name, arch, exists); dialog.close(); }; - if(exists) { + if (exists) { new OverwriteDialog(dialog).open().done(save); } else { save(); @@ -47,137 +115,94 @@ odoo.define('website_snippet_preset', function(require) { }); dialog.open(); }, - presetExists: function(snippet, name) { - var self = this; + presetExists: function (snippet, name) { var get_done = $.Deferred(); this._rpc({ model: 'snippet.preset', method: 'search_read', - domain: [['snippet', '=', snippet], ['name', '=', name]] - }).then(function(records) { - get_done.resolve(records.length == 0 ? false : records[0]['id']); + domain: [['snippet', '=', snippet], ['name', '=', name]], + }).then(function (records) { + get_done + .resolve(records.length === 0 ? false : records[0].id); }); return get_done.promise(); }, - deletePreset: function(id) { + deletePreset: function (id) { var self = this; return this._rpc({ model: 'snippet.preset', method: 'unlink', - args: [[id]] - }).then(function() { - self.loadPresets().then(function(records) { + args: [[id]], + }).then(function () { + self.loadPresets().then(function (records) { self.renderPresets(records); }); }); }, - savePreset: function(snippet, name, arch, id) { + savePreset: function (snippet, name, arch, id) { var self = this; var save = null; - if (!id) + if (id) { save = this._rpc({ model: 'snippet.preset', - method: 'create', - args: [{arch: arch, name: name, snippet: snippet}] + method: 'write', + args: [[id], {arch: arch}], }); - else + } else { save = this._rpc({ model: 'snippet.preset', - method: 'write', - args: [[id],{arch: arch}] + method: 'create', + args: [{arch: arch, name: name, snippet: snippet}], }); + } - save.then(function() { - self.loadPresets().then(function(records) { + save.then(function () { + self.loadPresets().then(function (records) { self.renderPresets(records); }); }); return save; }, - loadPresets: function() { + loadPresets: function () { return this._rpc({ model: 'snippet.preset', method: 'search_read', order: 'name asc', - domain: [['snippet', '=', this.snippet_name]] + domain: [['snippet', '=', this.snippet_name]], }); }, - renderPreset: function(record) { + renderPreset: function (record) { var self = this; - var $item = $(qweb.render('website_snippet_preset.Item', {'record': record})); + var $item = $(qweb + .render('website_snippet_preset.Item', {'record': record})); $item.data('record', record); - $item.click(function() { - self.applyPreset($(this).data('record')['arch']); + $item.click(function () { + self.applyPreset($(this).data('record').arch); }); - $item.find('i').click(function(e) { - self.deletePreset($(this).closest('li').data('record')['id']); + $item.find('i').click(function (e) { + self.deletePreset($(this).closest('li').data('record').id); e.stopPropagation(); }); this.$preset_load_menu.append($item); return $item; }, - renderPresets: function(records) { + renderPresets: function (records) { this.$preset_load_menu.html(''); for (var i in records) { this.renderPreset(records[i]); } }, - applyPreset: function(arch) { + applyPreset: function (arch) { var $arch = $(arch); - console.log(arch); this.$target.html($arch.html()); this.$target.attr('class', $arch.attr('class')); this.$target.attr('style', $arch.attr('style')); this.$target.closest('.o_editable').trigger('content_changed'); - } - }); - - var OverwriteDialog = Dialog.extend({ - init: function(parent) { - var self = this; - this.overwrite = $.Deferred(); - var options = { - title: _t('Overwrite?'), - $content: $(_t('

Preset with this name already exists. Do you want to overwrite it?

')), - buttons: [ - {text: _t("Overwrite"), classes: 'btn-primary', click: this.overwriteClicked.bind(this)}, - {text: _t("No"), classes: 'btn-default', close: true} - ] - }; - return this._super(parent, options); }, - overwriteClicked: function() { - this.overwrite.resolve(); - this.close(); - }, - open: function() { - this._super.apply(this, arguments); - return this.overwrite.promise(); - } - }); - - var EnterNameDialog = Dialog.extend({ - init: function(parent) { - var self = this; - var options = { - title: _t('Enter Name'), - $content: $(qweb.render('website_snippet_preset.EnterNameDialog', { - name: '' - })), - buttons: [ - {text: _t("Save"), classes: 'btn-primary', click: this.saveClicked.bind(this) }, - {text: _t("Cancel"), classes: 'btn-default', close: true} - ] - }; - return this._super(parent, options); - }, - saveClicked: function() { - this.trigger('save', this.$('input[name="name"]').val()); - } }); return { 'EnterNameDialog': EnterNameDialog, - 'OverwriteDialog': OverwriteDialog - } + 'OverwriteDialog': OverwriteDialog, + }; }); From 8a6224feb5b262f5208d1532f0de2e17cf306734 Mon Sep 17 00:00:00 2001 From: oca-travis Date: Fri, 17 May 2019 10:25:31 +0000 Subject: [PATCH 5/7] [UPD] Update website_snippet_preset.pot --- .../i18n/website_snippet_preset.pot | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/website_snippet_preset/i18n/website_snippet_preset.pot b/website_snippet_preset/i18n/website_snippet_preset.pot index f7fef90ae0..8b5a651321 100644 --- a/website_snippet_preset/i18n/website_snippet_preset.pot +++ b/website_snippet_preset/i18n/website_snippet_preset.pot @@ -15,9 +15,9 @@ msgstr "" #. module: website_snippet_preset #. openerp-web -#: code:addons/website_snippet_preset/static/src/js/website_snippet_preset.js:141 +#: code:addons/website_snippet_preset/static/src/js/website_snippet_preset.js:17 #, python-format -msgid "

Preset with this name already exists. Do you want to overwrite it?

" +msgid "

Preset with this name already exists.Do you want to overwrite it?

" msgstr "" #. module: website_snippet_preset @@ -27,7 +27,7 @@ msgstr "" #. module: website_snippet_preset #. openerp-web -#: code:addons/website_snippet_preset/static/src/js/website_snippet_preset.js:169 +#: code:addons/website_snippet_preset/static/src/js/website_snippet_preset.js:61 #, python-format msgid "Cancel" msgstr "" @@ -49,7 +49,7 @@ msgstr "" #. module: website_snippet_preset #. openerp-web -#: code:addons/website_snippet_preset/static/src/js/website_snippet_preset.js:163 +#: code:addons/website_snippet_preset/static/src/js/website_snippet_preset.js:49 #, python-format msgid "Enter Name" msgstr "" @@ -91,21 +91,21 @@ msgstr "" #. module: website_snippet_preset #. openerp-web -#: code:addons/website_snippet_preset/static/src/js/website_snippet_preset.js:144 +#: code:addons/website_snippet_preset/static/src/js/website_snippet_preset.js:28 #, python-format msgid "No" msgstr "" #. module: website_snippet_preset #. openerp-web -#: code:addons/website_snippet_preset/static/src/js/website_snippet_preset.js:143 +#: code:addons/website_snippet_preset/static/src/js/website_snippet_preset.js:23 #, python-format msgid "Overwrite" msgstr "" #. module: website_snippet_preset #. openerp-web -#: code:addons/website_snippet_preset/static/src/js/website_snippet_preset.js:140 +#: code:addons/website_snippet_preset/static/src/js/website_snippet_preset.js:16 #, python-format msgid "Overwrite?" msgstr "" @@ -119,7 +119,7 @@ msgstr "" #. module: website_snippet_preset #. openerp-web -#: code:addons/website_snippet_preset/static/src/js/website_snippet_preset.js:168 +#: code:addons/website_snippet_preset/static/src/js/website_snippet_preset.js:56 #, python-format msgid "Save" msgstr "" From 150047a9733710d4e82eb4fdb33a21101975c6f7 Mon Sep 17 00:00:00 2001 From: tarteo Date: Fri, 17 Jan 2020 17:07:35 +0100 Subject: [PATCH 6/7] [IMP] website_snippet_preset: black, isort --- website_snippet_preset/__manifest__.py | 31 +++++++------------ .../models/snippet_preset.py | 4 +-- 2 files changed, 14 insertions(+), 21 deletions(-) diff --git a/website_snippet_preset/__manifest__.py b/website_snippet_preset/__manifest__.py index ae6c05c871..a4c691979a 100644 --- a/website_snippet_preset/__manifest__.py +++ b/website_snippet_preset/__manifest__.py @@ -2,23 +2,16 @@ # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). { - 'name': 'Website Snippet Presets', - 'summary': 'This module allows the user ' - 'to save and restore presets of snippets.', - 'category': 'Website', - 'version': '11.0.1.0.0', - 'author': 'Onestein, Odoo Community Association (OCA)', - 'license': 'AGPL-3', - 'website': 'https://github.com/OCA/website', - 'depends': [ - 'website' - ], - 'data': [ - 'templates/assets.xml', - 'security/ir.model.access.csv' - ], - 'qweb': [ - 'static/src/xml/website_snippet_preset.xml' - ], - 'installable': True, + "name": "Website Snippet Presets", + "summary": "This module allows the user " + "to save and restore presets of snippets.", + "category": "Website", + "version": "11.0.1.0.0", + "author": "Onestein, Odoo Community Association (OCA)", + "license": "AGPL-3", + "website": "https://github.com/OCA/website", + "depends": ["website"], + "data": ["templates/assets.xml", "security/ir.model.access.csv"], + "qweb": ["static/src/xml/website_snippet_preset.xml"], + "installable": True, } diff --git a/website_snippet_preset/models/snippet_preset.py b/website_snippet_preset/models/snippet_preset.py index 3224812a22..b84ad73b12 100644 --- a/website_snippet_preset/models/snippet_preset.py +++ b/website_snippet_preset/models/snippet_preset.py @@ -1,11 +1,11 @@ # Copyright 2018 Onestein # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). -from odoo import models, fields +from odoo import fields, models class SnippetPreset(models.Model): - _name = 'snippet.preset' + _name = "snippet.preset" snippet = fields.Char() name = fields.Char() From c2416a07ab4456270ad3ca755fdffec75a599332 Mon Sep 17 00:00:00 2001 From: tarteo Date: Fri, 17 Jan 2020 17:08:12 +0100 Subject: [PATCH 7/7] [MIG] website_snippet_preset: Migration to 13.0 [IMP] website_snippet_preset: black, isort --- website_snippet_preset/__manifest__.py | 2 +- .../readme/CONTRIBUTORS.rst | 1 + website_snippet_preset/readme/DESCRIPTION.rst | 1 + website_snippet_preset/readme/USAGE.rst | 8 + .../static/src/js/website_snippet_preset.js | 172 +++++++++++------- .../static/src/xml/website_snippet_preset.xml | 34 ++-- 6 files changed, 136 insertions(+), 82 deletions(-) create mode 100644 website_snippet_preset/readme/CONTRIBUTORS.rst create mode 100644 website_snippet_preset/readme/DESCRIPTION.rst create mode 100644 website_snippet_preset/readme/USAGE.rst diff --git a/website_snippet_preset/__manifest__.py b/website_snippet_preset/__manifest__.py index a4c691979a..0a31ccd5c0 100644 --- a/website_snippet_preset/__manifest__.py +++ b/website_snippet_preset/__manifest__.py @@ -6,7 +6,7 @@ "summary": "This module allows the user " "to save and restore presets of snippets.", "category": "Website", - "version": "11.0.1.0.0", + "version": "13.0.1.0.0", "author": "Onestein, Odoo Community Association (OCA)", "license": "AGPL-3", "website": "https://github.com/OCA/website", diff --git a/website_snippet_preset/readme/CONTRIBUTORS.rst b/website_snippet_preset/readme/CONTRIBUTORS.rst new file mode 100644 index 0000000000..47b6403d06 --- /dev/null +++ b/website_snippet_preset/readme/CONTRIBUTORS.rst @@ -0,0 +1 @@ +* Dennis Sluijk diff --git a/website_snippet_preset/readme/DESCRIPTION.rst b/website_snippet_preset/readme/DESCRIPTION.rst new file mode 100644 index 0000000000..d5a2944519 --- /dev/null +++ b/website_snippet_preset/readme/DESCRIPTION.rst @@ -0,0 +1 @@ +This module allows the user to save and restore presets of snippets. diff --git a/website_snippet_preset/readme/USAGE.rst b/website_snippet_preset/readme/USAGE.rst new file mode 100644 index 0000000000..6b2008748b --- /dev/null +++ b/website_snippet_preset/readme/USAGE.rst @@ -0,0 +1,8 @@ +To use this module, you need to: + +#. Go in editing mode on the website +#. Select a snippet +#. Click 'Presets' +#. Click 'Save Current' +#. Select a different snippet of the same type +#. Select the added preset in the 'Load' menu diff --git a/website_snippet_preset/static/src/js/website_snippet_preset.js b/website_snippet_preset/static/src/js/website_snippet_preset.js index 806465c087..b4148d4e01 100644 --- a/website_snippet_preset/static/src/js/website_snippet_preset.js +++ b/website_snippet_preset/static/src/js/website_snippet_preset.js @@ -3,7 +3,7 @@ odoo.define('website_snippet_preset', function (require) { 'use strict'; - var snippet_editor = require('web_editor.snippet.editor'); + var editor = require('web_editor.snippet.editor'); var core = require('web.core'); var Dialog = require('web.Dialog'); var qweb = core.qweb; @@ -70,33 +70,123 @@ odoo.define('website_snippet_preset', function (require) { this.trigger('save', this.$('input[name="name"]').val()); }, }); - snippet_editor.Editor.include({ - xmlDependencies: snippet_editor.Editor + + var ChoiceDialog = Dialog.extend({ + init: function (parent, snippetName) { + this.snippetName = snippetName; + + var options = { + title: _t('Choose preset to load...'), + $content: $(qweb + .render('website_snippet_preset.ChoiceDialog', { + name: '', + })), + buttons: [ + { + text: _t("Cancel"), + classes: 'btn-default', + close: true, + }, + ], + }; + return this._super(parent, options); + }, + start: function () { + var res = this._super.apply(this, arguments); + this.$list = this.$el.find('.list-group'); + this.loadPresets().then(function (records) { + this.renderPresets(records); + }.bind(this)); + return res; + }, + itemClicked: function (arch) { + this.trigger('apply', arch); + this.close(); + }, + deletePreset: function (id) { + var self = this; + return this._rpc({ + model: 'snippet.preset', + method: 'unlink', + args: [[id]], + }).then(function () { + self.loadPresets().then(function (records) { + self.renderPresets(records); + }); + }); + }, + loadPresets: function () { + return this._rpc({ + model: 'snippet.preset', + method: 'search_read', + order: 'name asc', + domain: [['snippet', '=', this.snippetName]], + }); + }, + renderPreset: function (record) { + var self = this; + var $item = $(qweb + .render('website_snippet_preset.Item', {'record': record})); + $item.data('record', record); + $item.click(function () { + self.itemClicked($(this).data('record').arch); + }); + $item.find('.badge').click(function (e) { + self.deletePreset($(this).closest('.list-group-item').data('record').id); + e.stopPropagation(); + }); + this.$list.append($item); + return $item; + }, + renderPresets: function (records) { + this.$list.html(''); + for (var i in records) { + this.renderPreset(records[i]); + } + }, + }); + + editor.Editor.include({ + xmlDependencies: editor.Editor .prototype.xmlDependencies.concat( [ '/website_snippet_preset/static/' + 'src/xml/website_snippet_preset.xml', ] ), - events: _.extend({}, snippet_editor.Editor.prototype.events, { - 'click .o_snippet_preset_save': 'saveCurrentPreset', - }), - start: function () { + _initializeOptions: function () { var res = this._super.apply(this, arguments); - this.$preset_menu = this.$('.o_snippet_preset'); - this.$preset_load_menu = this.$('.o_snippet_preset_load'); - this.snippet_name = this.$target.data().name; - if (!this.snippet_name) { - this.$preset_menu.hide(); + var $optionsSection = _.last(this._customize$Elements); + var snippetName = this.$target.data().name; + + var $presetLoad = $optionsSection.find('.o_snippet_preset_load'); + $presetLoad.data('snippetName', snippetName); + $presetLoad.click(this.loadPreset.bind(this)); + + var $presetSave = $optionsSection.find('.o_snippet_preset_save'); + $presetSave.data('snippetName', snippetName); + $presetSave.click(this.saveCurrentPreset.bind(this)); + + if (!snippetName) { + $presetLoad.addClass('d-none'); + $presetSave.addClass('d-none'); } - this.loadPresets().then(function (records) { - this.renderPresets(records); - }.bind(this)); return res; }, - saveCurrentPreset: function () { + loadPreset: function (event) { + var $target = $(event.target); + var snippetName = $target.data('snippetName'); + + var self = this; + var dialog = new ChoiceDialog(this, snippetName); + dialog.on('apply', this, function (arch) { + self.applyPreset(arch); + }); + dialog.open(); + }, + saveCurrentPreset: function (event) { var arch = this.$target[0].outerHTML; - var snippet = this.snippet_name; + var snippet = $(event.target).data('snippetName'); var self = this; var dialog = new EnterNameDialog(this); @@ -127,18 +217,6 @@ odoo.define('website_snippet_preset', function (require) { }); return get_done.promise(); }, - deletePreset: function (id) { - var self = this; - return this._rpc({ - model: 'snippet.preset', - method: 'unlink', - args: [[id]], - }).then(function () { - self.loadPresets().then(function (records) { - self.renderPresets(records); - }); - }); - }, savePreset: function (snippet, name, arch, id) { var self = this; var save = null; @@ -155,43 +233,8 @@ odoo.define('website_snippet_preset', function (require) { args: [{arch: arch, name: name, snippet: snippet}], }); } - - save.then(function () { - self.loadPresets().then(function (records) { - self.renderPresets(records); - }); - }); return save; }, - loadPresets: function () { - return this._rpc({ - model: 'snippet.preset', - method: 'search_read', - order: 'name asc', - domain: [['snippet', '=', this.snippet_name]], - }); - }, - renderPreset: function (record) { - var self = this; - var $item = $(qweb - .render('website_snippet_preset.Item', {'record': record})); - $item.data('record', record); - $item.click(function () { - self.applyPreset($(this).data('record').arch); - }); - $item.find('i').click(function (e) { - self.deletePreset($(this).closest('li').data('record').id); - e.stopPropagation(); - }); - this.$preset_load_menu.append($item); - return $item; - }, - renderPresets: function (records) { - this.$preset_load_menu.html(''); - for (var i in records) { - this.renderPreset(records[i]); - } - }, applyPreset: function (arch) { var $arch = $(arch); this.$target.html($arch.html()); @@ -204,5 +247,6 @@ odoo.define('website_snippet_preset', function (require) { return { 'EnterNameDialog': EnterNameDialog, 'OverwriteDialog': OverwriteDialog, + 'ChoiceDialog': ChoiceDialog }; }); diff --git a/website_snippet_preset/static/src/xml/website_snippet_preset.xml b/website_snippet_preset/static/src/xml/website_snippet_preset.xml index 70cd2f1584..5d86458a32 100644 --- a/website_snippet_preset/static/src/xml/website_snippet_preset.xml +++ b/website_snippet_preset/static/src/xml/website_snippet_preset.xml @@ -3,27 +3,20 @@ License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). -->