diff options
| author | Christophe Simonis <chs@odoo.com> | 2018-11-29 20:06:16 +0100 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2018-11-29 20:06:16 +0100 |
| commit | ce4cc24621bf6430d7d3a2d469b375b59120c200 (patch) | |
| tree | 3837b5fe41ff88b24136ab53c871bc01f965cab1 /addons/web_editor | |
| parent | 4d7aa97da38e497fef31a06543bfa5d2c8785708 (diff) | |
| parent | 82a1e1dcc33d7c123e50d3e1aacb5e127f57c521 (diff) | |
[MERGE] forward port branch 12.0 up to 82a1e1dcc33
Diffstat (limited to 'addons/web_editor')
| -rw-r--r-- | addons/web_editor/i18n/da.po | 15 | ||||
| -rw-r--r-- | addons/web_editor/models/ir_ui_view.py | 2 | ||||
| -rw-r--r-- | addons/web_editor/static/src/js/editor/rte.summernote.js | 1 |
3 files changed, 10 insertions, 8 deletions
diff --git a/addons/web_editor/i18n/da.po b/addons/web_editor/i18n/da.po index b7855c04a8c..17dca2d6a08 100644 --- a/addons/web_editor/i18n/da.po +++ b/addons/web_editor/i18n/da.po @@ -3,25 +3,26 @@ # * web_editor # # Translators: -# Martin Trigaux, 2018 # Hans Henrik Gabelgaard <hhg@gabelgaard.org>, 2018 # jonas jensen <j.jensen@tcomp.dk>, 2018 -# Per Rasmussen <perhgrasmussen@gmail.com>, 2018 # Morten Schou <ms@msteknik.dk>, 2018 # Jonathan Stein <cgs@image.dk>, 2018 # Jesper Carstensen <jc@danodoo.dk>, 2018 # Jarnhold Nattestad <nattestads@gmail.com>, 2018 +# Martin Trigaux, 2018 +# Per Rasmussen <perhgrasmussen@gmail.com>, 2018 # Pernille Kristensen <pernillekristensen1994@gmail.com>, 2018 -# Sanne Kristensen <sanne@vkdata.dk>, 2018 -# lhmflexerp <lhm@flexerp.dk>, 2018 # Ejner Sønniksen <ejner@vkdata.dk>, 2018 +# lhmflexerp <lhm@flexerp.dk>, 2018 +# Sanne Kristensen <sanne@vkdata.dk>, 2018 +# msgid "" msgstr "" "Project-Id-Version: Odoo Server saas~11.5\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2018-10-02 10:06+0000\n" -"PO-Revision-Date: 2018-10-02 10:06+0000\n" -"Last-Translator: Ejner Sønniksen <ejner@vkdata.dk>, 2018\n" +"PO-Revision-Date: 2018-08-24 09:33+0000\n" +"Last-Translator: Sanne Kristensen <sanne@vkdata.dk>, 2018\n" "Language-Team: Danish (https://www.transifex.com/odoo/teams/41243/da/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -594,7 +595,7 @@ msgstr "" #. module: web_editor #: model:ir.model,name:web_editor.model_ir_http msgid "HTTP Routing" -msgstr "" +msgstr "HTTP Routing" #. module: web_editor #. openerp-web diff --git a/addons/web_editor/models/ir_ui_view.py b/addons/web_editor/models/ir_ui_view.py index 23bf488ed47..f0c295787a2 100644 --- a/addons/web_editor/models/ir_ui_view.py +++ b/addons/web_editor/models/ir_ui_view.py @@ -201,7 +201,7 @@ class IrUiView(models.Model): @api.model def _view_obj(self, view_id): if isinstance(view_id, str): - return self.search([('key', '=', view_id)]) or self.env.ref(view_id) + return self.search([('key', '=', view_id)], limit=1) or self.env.ref(view_id) elif isinstance(view_id, int): return self.browse(view_id) # assume it's already a view object (WTF?) diff --git a/addons/web_editor/static/src/js/editor/rte.summernote.js b/addons/web_editor/static/src/js/editor/rte.summernote.js index 9f13a9237d1..62586a53b5c 100644 --- a/addons/web_editor/static/src/js/editor/rte.summernote.js +++ b/addons/web_editor/static/src/js/editor/rte.summernote.js @@ -455,6 +455,7 @@ eventHandler.modules.imageDialog.showImageDialog = function ($editable) { options: { lastFilters: ['background'], onUpload: $editable.data('callbacks').onUpload, + noVideos: $editable.data('oe-model') === "mail.compose.message", }, }); return new $.Deferred().reject(); |