[MERGE] forward port branch 11.0 up to 20e4cd5bcd1

1 files changed, 84 insertions, 53 deletions

diff --git a/addons/web_editor/static/src/js/widgets/widgets.js b/addons/web_editor/static/src/js/widgets/widgets.js
index e499e83843d..b93724c7a30 100644
--- a/addons/web_editor/static/src/js/widgets/widgets.js
+++ b/addons/web_editor/static/src/js/widgets/widgets.js
@@ -120,7 +120,13 @@ var ImageDialog = Widget.extend({
         this._super.apply(this, arguments);
         this.options = options || {};
         this.accept = this.options.accept || this.options.document ? "*/*" : "image/*";
-        this.domain = this.options.domain || ['|', ['mimetype', '=', false], ['mimetype', this.options.document ? 'not in' : 'in', ['image/gif', 'image/jpe', 'image/jpeg', 'image/jpg', 'image/gif', 'image/png']]];
+        if (this.options.res_id) {
+            this.domain = ['|',
+                '&', ['res_model', '=', this.options.res_model], ['res_id', '=', this.options.res_id],
+                ['res_model', '=', 'ir.ui.view']];
+        } else {
+            this.domain = [['res_model', '=', 'ir.ui.view']];
+        }
         this.parent = parent;
         this.old_media = media;
         this.media = media;
@@ -171,6 +177,7 @@ var ImageDialog = Widget.extend({
         }
     },
     save: function () {
+        var self = this;
         if (this.options.select_images) {
             return this.images;
         }
@@ -181,34 +188,55 @@ var ImageDialog = Widget.extend({
             img = _.find(this.images, function (img) { return img.id === id;});
         }
 
-        var media;
-        if (!img.is_document) {
-            if (this.media.tagName !== "IMG" || !this.old_media) {
-                this.add_class = "pull-left";
-                this.style = {"width": "100%"};
-            }
-            if (this.media.tagName !== "IMG") {
-                media = document.createElement('img');
-                $(this.media).replaceWith(media);
-                this.media = media;
-            }
-            this.media.setAttribute('src', img.src);
-        } else {
-            if (this.media.tagName !== "A") {
-                $('.note-control-selection').hide();
-                media = document.createElement('a');
-                $(this.media).replaceWith(media);
-                this.media = media;
-            }
-            this.media.setAttribute('href', '/web/content/' + img.id + '?unique=' + img.checksum + '&download=true');
-            $(this.media).addClass('o_image').attr('title', img.name).attr('data-mimetype', img.mimetype);
+        var def = $.when();
+        if (!img.access_token) {
+            def = this._rpc({
+                model: 'ir.attachment',
+                method: 'generate_access_token',
+                args: [[img.id]]
+            }).then(function (access_token) {
+                img.access_token = access_token[0];
+            });
         }
 
-        $(this.media).attr('alt', img.alt);
-        var style = this.style;
-        if (style) { $(this.media).css(style); }
+        return def.then(function () {
+            var media;
+            if (!img.is_document) {
+                if (img.access_token && self.options.res_model !== 'ir.ui.view') {
+                    img.src += _.str.sprintf('?access_token=%s', img.access_token);
+                }
+                if (self.media.tagName !== "IMG" || !self.old_media) {
+                    self.add_class = "pull-left";
+                    self.style = {"width": "100%"};
+                }
+                if (self.media.tagName !== "IMG") {
+                    media = document.createElement('img');
+                    $(self.media).replaceWith(media);
+                    self.media = media;
+                }
+                self.media.setAttribute('src', img.src);
+            } else {
+                if (self.media.tagName !== "A") {
+                    $('.note-control-selection').hide();
+                    media = document.createElement('a');
+                    $(self.media).replaceWith(media);
+                    self.media = media;
+                }
+                var href = '/web/content/' + img.id + '?';
+                if (img.access_token && self.options.res_model !== 'ir.ui.view') {
+                    href += _.str.sprintf('access_token=%s&', img.access_token);
+                }
+                href += 'unique=' + img.checksum + '&download=true';
+                self.media.setAttribute('href', href);
+                $(self.media).addClass('o_image').attr('title', img.name).attr('data-mimetype', img.mimetype);
+            }
 
-        return this.media;
+            $(self.media).attr('alt', img.alt);
+            var style = self.style;
+            if (style) { $(self.media).css(style); }
+
+            return self.media;
+        });
     },
     clear: function () {
         this.media.className = this.media.className.replace(/(^|\s+)((img(\s|$)|img-(?!circle|rounded|thumbnail))[^\s]*)/g, ' ');
@@ -282,7 +310,7 @@ var ImageDialog = Widget.extend({
         }
     },
     fetch_existing: function (needle) {
-        var domain = [['res_model', '=', 'ir.ui.view']].concat(this.domain);
+        var domain = this.domain.concat(['|', ['mimetype', '=', false], ['mimetype', this.options.document ? 'not in' : 'in', ['image/gif', 'image/jpe', 'image/jpeg', 'image/jpg', 'image/gif', 'image/png']]]);
         if (needle && needle.length) {
             domain.push('|', ['datas_fname', 'ilike', needle], ['name', 'ilike', needle]);
         }
@@ -292,7 +320,7 @@ var ImageDialog = Widget.extend({
             args: [],
             kwargs: {
                 domain: domain,
-                fields: ['name', 'mimetype', 'checksum', 'url', 'type'],
+                fields: ['name', 'mimetype', 'checksum', 'url', 'type', 'res_id', 'res_model', 'access_token'],
                 order: [{name: 'id', asc: false}],
                 context: weContext.get(),
             }
@@ -305,7 +333,7 @@ var ImageDialog = Widget.extend({
             return (r.url || r.id);
         });
         _.each(this.records, function (record) {
-            record.src = record.url || _.str.sprintf('/web/image/%s/%s', record.id, record.name); // Name is added for SEO purposes
+            record.src = record.url || _.str.sprintf('/web/image/%s/%s', record.id, encodeURI(record.name)); // Name is added for SEO purposes
             record.is_document = !(/gif|jpe|jpg|png/.test(record.mimetype));
         });
         this.display_attachments();
@@ -1001,18 +1029,21 @@ var MediaDialog = Dialog.extend({
         return this._super.apply(this, arguments);
     },
     save: function () {
+        var self = this;
+        var args = arguments;
+        var _super = this._super;
         if (this.options.select_images) {
-            this.final_data = this.active.save();
-            this._super.apply(this, arguments);
-            return;
+            return $.when(this.active.save()).then(function (data) {
+                self.final_data = data;
+                return _super.apply(self, args);
+            });
         }
         if (this.rte) {
             this.range.select();
             this.rte.historyRecordUndo(this.media);
         }
 
-        var self = this;
-        if (self.media) {
+        if (this.media) {
             this.media.innerHTML = "";
             if (this.active !== this.imageDialog && this.active !== this.documentDialog) {
                 this.imageDialog.clear();
@@ -1029,27 +1060,27 @@ var MediaDialog = Dialog.extend({
             this.range.insertNode(this.media, true);
             this.active.media = this.media;
         }
-        this.active.save();
 
-        if (this.active.add_class) {
-            $(this.active.media).addClass(this.active.add_class);
-        }
-        var media = this.active.media;
-
-        this.final_data = [media, self.old_media];
-        $(document.body).trigger("media-saved", this.final_data);
-        $(self.old_media).trigger("save", this.final_data);
-        $(this.final_data).trigger('input');
-
-        // Update editor bar after image edition (in case the image change to icon or other)
-        _.defer(function () {
-            if (!media.parentNode) return;
-            range.createFromNode(media).select();
-            click_event(media, "mousedown");
-            click_event(media, "mouseup");
+        return $.when(this.active.save()).then(function () {
+            if (self.active.add_class) {
+                $(self.active.media).addClass(self.active.add_class);
+            }
+            var media = self.active.media;
+
+            self.final_data = [media, self.old_media];
+            $(document.body).trigger("media-saved", self.final_data);
+            $(self.old_media).trigger("save", self.final_data);
+            $(self.final_data).trigger('input');
+
+            // Update editor bar after image edition (in case the image change to icon or other)
+            _.defer(function () {
+                if (!media.parentNode) return;
+                range.createFromNode(media).select();
+                click_event(media, "mousedown");
+                click_event(media, "mouseup");
+            });
+            return _super.apply(self, args);
         });
-
-        this._super.apply(this, arguments);
     },
     searchTimer: null,
     search: function () {