From ce94517d8d63b76526f1d5a23601943b2f77bf51 Mon Sep 17 00:00:00 2001 From: MuK IT GmbH Date: Fri, 8 Mar 2019 23:56:21 +0000 Subject: [PATCH] publish muk_web_utils - 12.0 --- muk_web_utils/__manifest__.py | 2 +- muk_web_utils/controllers/backend.py | 2 +- muk_web_utils/static/src/js/fields/binary.js | 2 +- muk_web_utils/static/src/js/fields/image.js | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/muk_web_utils/__manifest__.py b/muk_web_utils/__manifest__.py index dbc362e..9aeb275 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.20", + "version": "12.0.2.8.21", "category": "Extra Tools", "license": "AGPL-3", "author": "MuK IT", diff --git a/muk_web_utils/controllers/backend.py b/muk_web_utils/controllers/backend.py index 54b125b..a5da2af 100644 --- a/muk_web_utils/controllers/backend.py +++ b/muk_web_utils/controllers/backend.py @@ -30,5 +30,5 @@ class BackendController(http.Controller): def max_upload_size(self, **kw): params = request.env['ir.config_parameter'].sudo() return { - 'max_upload_size': int(params.get_param("muk_web_utils.max_upload_size", default=25)) + 'max_upload_size': int(params.get_param('muk_web_utils.binary_max_size', default=25)) } \ No newline at end of file diff --git a/muk_web_utils/static/src/js/fields/binary.js b/muk_web_utils/static/src/js/fields/binary.js index f05d85c..4e924a2 100644 --- a/muk_web_utils/static/src/js/fields/binary.js +++ b/muk_web_utils/static/src/js/fields/binary.js @@ -36,7 +36,7 @@ fields.FieldBinaryFile.include({ }).done(function(result) { this.max_upload_size = result.max_upload_size * 1024 * 1024; }.bind(this)); - return this._super.apply(this, arguments); + return $.when(this._super.apply(this, arguments), def); }, _renderReadonly: function () { this._super.apply(this, arguments); diff --git a/muk_web_utils/static/src/js/fields/image.js b/muk_web_utils/static/src/js/fields/image.js index a54bf3b..2cd9e68 100644 --- a/muk_web_utils/static/src/js/fields/image.js +++ b/muk_web_utils/static/src/js/fields/image.js @@ -50,7 +50,7 @@ fields.FieldBinaryImage.include({ }).done(function(result) { this.max_upload_size = result.max_upload_size * 1024 * 1024; }.bind(this)); - return this._super.apply(this, arguments); + return $.when(this._super.apply(this, arguments), def); }, _render: function () { this._super.apply(this, arguments);