From d067015d2e4492f4ec5cc7d50fd9e1e6291bd9ff Mon Sep 17 00:00:00 2001 From: MuK IT GmbH Date: Sat, 23 Feb 2019 10:22:09 +0000 Subject: [PATCH] publish muk_web_utils - 12.0 --- muk_web_utils/__manifest__.py | 2 +- muk_web_utils/static/src/js/fields/binary.js | 20 +-- muk_web_utils/static/src/js/fields/image.js | 13 +- muk_web_utils/static/src/scss/image.scss | 2 +- muk_web_utils/template/assets.xml | 136 +++++++++---------- 5 files changed, 90 insertions(+), 83 deletions(-) diff --git a/muk_web_utils/__manifest__.py b/muk_web_utils/__manifest__.py index dde69be..02b64b9 100644 --- a/muk_web_utils/__manifest__.py +++ b/muk_web_utils/__manifest__.py @@ -20,7 +20,7 @@ { "name": "MuK Web Utils", "summary": """Utility Features""", - "version": "12.0.2.8.13", + "version": "12.0.2.8.15", "category": "Extra Tools", "license": "AGPL-3", "author": "MuK IT", diff --git a/muk_web_utils/static/src/js/fields/binary.js b/muk_web_utils/static/src/js/fields/binary.js index c2e8f5c..f05d85c 100644 --- a/muk_web_utils/static/src/js/fields/binary.js +++ b/muk_web_utils/static/src/js/fields/binary.js @@ -38,16 +38,16 @@ fields.FieldBinaryFile.include({ }.bind(this)); return this._super.apply(this, arguments); }, -}); - -fields.FieldBinaryImage.include({ - willStart: function () { - var def = this._rpc({ - route: '/params/muk_web_utils.binary_max_size', - }).done(function(result) { - this.max_upload_size = result.max_upload_size * 1024 * 1024; - }.bind(this)); - return this._super.apply(this, arguments); + _renderReadonly: function () { + this._super.apply(this, arguments); + var $wrapper = $('
', { + class: "mk_field_binary_wrapper" + }); + $wrapper.addClass(this.$el.attr('class')); + this.$el.removeClass("o_field_widget"); + this.$el.removeClass("o_hidden"); + $wrapper.append(this.$el); + this.setElement($wrapper); }, }); diff --git a/muk_web_utils/static/src/js/fields/image.js b/muk_web_utils/static/src/js/fields/image.js index 9b1843f..6e334b7 100644 --- a/muk_web_utils/static/src/js/fields/image.js +++ b/muk_web_utils/static/src/js/fields/image.js @@ -44,13 +44,20 @@ var _t = core._t; var QWeb = core.qweb; fields.FieldBinaryImage.include({ + willStart: function () { + var def = this._rpc({ + route: '/params/muk_web_utils.binary_max_size', + }).done(function(result) { + this.max_upload_size = result.max_upload_size * 1024 * 1024; + }.bind(this)); + return this._super.apply(this, arguments); + }, _render: function () { this._super.apply(this, arguments); - this.$('.mk_form_image_wrapper').remove(); this.$('img').wrap($('
', { - class: "mk_form_image_wrapper" + class: "mk_field_image_wrapper" })); - var $wrapper = $('.mk_form_image_wrapper'); + var $wrapper = $('.mk_field_image_wrapper'); var width = this.nodeOptions.size ? this.nodeOptions.size[0] : this.attrs.width; var height = this.nodeOptions.size ? diff --git a/muk_web_utils/static/src/scss/image.scss b/muk_web_utils/static/src/scss/image.scss index 807ab19..ed1c334 100644 --- a/muk_web_utils/static/src/scss/image.scss +++ b/muk_web_utils/static/src/scss/image.scss @@ -19,7 +19,7 @@ .o_field_widget.o_field_image { @include media-breakpoint-up(sm, $o-extra-grid-breakpoints) { - .mk_form_image_wrapper { + .mk_field_image_wrapper { min-height: 60px; min-width: 80px; } diff --git a/muk_web_utils/template/assets.xml b/muk_web_utils/template/assets.xml index 14c716d..d731718 100644 --- a/muk_web_utils/template/assets.xml +++ b/muk_web_utils/template/assets.xml @@ -1,69 +1,69 @@ - - - - - - -