From 6b53accb2bb1a0c1187cb5955d7874430be03584 Mon Sep 17 00:00:00 2001 From: cfs Date: Wed, 27 Feb 2019 02:05:43 +0100 Subject: [PATCH] regression error from last commit. without this commit every image that you upload is added to the old one until saved. --- muk_web_utils/static/src/js/fields/image.js | 141 ++++++++++---------- 1 file changed, 71 insertions(+), 70 deletions(-) diff --git a/muk_web_utils/static/src/js/fields/image.js b/muk_web_utils/static/src/js/fields/image.js index 6e334b7..d59f270 100644 --- a/muk_web_utils/static/src/js/fields/image.js +++ b/muk_web_utils/static/src/js/fields/image.js @@ -1,70 +1,71 @@ -/********************************************************************************** -* -* Copyright (C) 2018 MuK IT GmbH -* -* Odoo Proprietary License v1.0 -* This software and associated files (the "Software") may only be used -* (executed, modified, executed after modifications) if you have -* purchased a valid license from the authors, typically via Odoo Apps, -* or if you have received a written agreement from the authors of the -* Software (see the COPYRIGHT file). -* -* You may develop Odoo modules that use the Software as a library -* (typically by depending on it, importing it and using its resources), -* but without copying any source code or material from the Software. -* You may distribute those modules under the license of your choice, -* provided that this license is compatible with the terms of the Odoo -* Proprietary License (For example: LGPL, MIT, or proprietary licenses -* similar to this one). -* -* It is forbidden to publish, distribute, sublicense, or sell copies of -* the Software or modified copies of the Software. -* -* The above copyright notice and this permission notice must be included -* in all copies or substantial portions of the Software. -* -* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS -* OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL -* THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING -* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER -* DEALINGS IN THE SOFTWARE. -* -**********************************************************************************/ - -odoo.define('muk_web_utils.image', function (require) { -"use strict"; - -var core = require('web.core'); -var session = require('web.session'); -var fields = require('web.basic_fields'); - -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.$('img').wrap($('
', { - class: "mk_field_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 ? - this.nodeOptions.size[1] : this.attrs.height; - $wrapper.css('min-width', (width || 50) + 'px'); - $wrapper.css('min-height', (height || 50) + 'px'); - }, -}); - -}); +/********************************************************************************** +* +* Copyright (C) 2018 MuK IT GmbH +* +* Odoo Proprietary License v1.0 +* This software and associated files (the "Software") may only be used +* (executed, modified, executed after modifications) if you have +* purchased a valid license from the authors, typically via Odoo Apps, +* or if you have received a written agreement from the authors of the +* Software (see the COPYRIGHT file). +* +* You may develop Odoo modules that use the Software as a library +* (typically by depending on it, importing it and using its resources), +* but without copying any source code or material from the Software. +* You may distribute those modules under the license of your choice, +* provided that this license is compatible with the terms of the Odoo +* Proprietary License (For example: LGPL, MIT, or proprietary licenses +* similar to this one). +* +* It is forbidden to publish, distribute, sublicense, or sell copies of +* the Software or modified copies of the Software. +* +* The above copyright notice and this permission notice must be included +* in all copies or substantial portions of the Software. +* +* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS +* OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL +* THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER +* DEALINGS IN THE SOFTWARE. +* +**********************************************************************************/ + +odoo.define('muk_web_utils.image', function (require) { +"use strict"; + +var core = require('web.core'); +var session = require('web.session'); +var fields = require('web.basic_fields'); + +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_field_image_wrapper').remove(); + this.$('img').wrap($('
', { + class: "mk_field_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 ? + this.nodeOptions.size[1] : this.attrs.height; + $wrapper.css('min-width', (width || 50) + 'px'); + $wrapper.css('min-height', (height || 50) + 'px'); + }, +}); + +});