diff --git a/setup/web_ir_actions_act_window_message/odoo/addons/web_ir_actions_act_window_message b/setup/web_ir_actions_act_window_message/odoo/addons/web_ir_actions_act_window_message new file mode 120000 index 000000000..9ba0c510a --- /dev/null +++ b/setup/web_ir_actions_act_window_message/odoo/addons/web_ir_actions_act_window_message @@ -0,0 +1 @@ +../../../../web_ir_actions_act_window_message \ No newline at end of file diff --git a/setup/web_ir_actions_act_window_message/setup.py b/setup/web_ir_actions_act_window_message/setup.py new file mode 100644 index 000000000..28c57bb64 --- /dev/null +++ b/setup/web_ir_actions_act_window_message/setup.py @@ -0,0 +1,6 @@ +import setuptools + +setuptools.setup( + setup_requires=['setuptools-odoo'], + odoo_addon=True, +) diff --git a/web_ir_actions_act_window_message/__manifest__.py b/web_ir_actions_act_window_message/__manifest__.py index a58674133..3742c30ec 100644 --- a/web_ir_actions_act_window_message/__manifest__.py +++ b/web_ir_actions_act_window_message/__manifest__.py @@ -2,20 +2,12 @@ # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). { "name": "Client side message boxes", - "version": "12.0.1.0.0", - "author": "Therp BV, " - "ACSONE SA/NV, " - "Odoo Community Association (OCA)", + "version": "13.0.1.0.0", + "author": "Therp BV, " "ACSONE SA/NV, " "Odoo Community Association (OCA)", "license": "AGPL-3", "category": "Hidden/Dependency", "summary": "Show a message box to users", - "depends": [ - 'web', - ], - "data": [ - 'views/templates.xml', - ], - "qweb": [ - 'static/src/xml/web_ir_actions_act_window_message.xml', - ], + "depends": ["web"], + "data": ["views/templates.xml"], + "qweb": ["static/src/xml/web_ir_actions_act_window_message.xml"], } diff --git a/web_ir_actions_act_window_message/static/src/js/web_ir_actions_act_window_message.js b/web_ir_actions_act_window_message/static/src/js/web_ir_actions_act_window_message.js index 1651a40d5..840dd4480 100644 --- a/web_ir_actions_act_window_message/static/src/js/web_ir_actions_act_window_message.js +++ b/web_ir_actions_act_window_message/static/src/js/web_ir_actions_act_window_message.js @@ -1,42 +1,38 @@ /* Copyright 2017 Therp BV, ACSONE SA/NV * * License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). */ -odoo.define('web.web_ir_actions_act_window_message', function(require) -{ +odoo.define("web.web_ir_actions_act_window_message", function(require) { "use strict"; - var ActionManager = require('web.ActionManager'), - core = require('web.core'), - Dialog = require('web.Dialog'); + var ActionManager = require("web.ActionManager"), + core = require("web.core"), + Dialog = require("web.Dialog"); var _t = core._t; ActionManager.include({ - _handleAction: function (action, options) { - if (action.type === 'ir.actions.act_window.message') { + _handleAction: function(action, options) { + if (action.type === "ir.actions.act_window.message") { return this._executeWindowMessageAction(action, options); } return this._super.apply(this, arguments); }, - _executeWindowMessageAction: function(action, options) - { + _executeWindowMessageAction: function(action, options) { var self = this, buttons = []; - if(action.close_button_title !== false) - { + if (action.close_button_title !== false) { buttons.push({ - text: action.close_button_title || _t('Close'), + text: action.close_button_title || _t("Close"), click: function() { - // refresh the view before closing the dialog + // Refresh the view before closing the dialog var controller = self.getCurrentController(); if (controller && controller.widget) { controller.widget.reload(); } - dialog.close() }, - classes: 'btn-default', - }) + classes: "btn-default", + }); } var is_html = action.is_html_message === true; @@ -50,8 +46,8 @@ odoo.define('web.web_ir_actions_act_window_message', function(require) content_properties = { text: action.message, css: { - 'white-space': 'pre-line', - } + "white-space": "pre-line", + }, }; } @@ -59,56 +55,54 @@ odoo.define('web.web_ir_actions_act_window_message', function(require) this, _.extend( { - size: 'medium', + size: "medium", title: action.title, - $content: $('
', content_properties), + $content: $("
", content_properties), buttons: buttons.concat( this.ir_actions_act_window_message_get_buttons( - action, function() { dialog.close() }) + action, + function() { + dialog.close(); + } + ) ), }, - options) - ) + options + ) + ); return dialog.open()._opened; }, - ir_actions_act_window_message_get_buttons: function(action, close_func) - { - // return an array of button definitions from action + ir_actions_act_window_message_get_buttons: function(action, close_func) { + // Return an array of button definitions from action var self = this; - return _.map(action.buttons || [], function(button_definition) - { + return _.map(action.buttons || [], function(button_definition) { return { - text: button_definition.name || 'No name set', - classes: button_definition.classes || 'btn-default', + text: button_definition.name || "No name set", + classes: button_definition.classes || "btn-default", click: function() { - if(button_definition.type == 'method') - { + if (button_definition.type == "method") { self._rpc({ model: button_definition.model, method: button_definition.method, args: button_definition.args, - kwargs: button_definition.kwargs - }).then(function(result) - { - if(_.isObject(result)) - { + kwargs: button_definition.kwargs, + }).then(function(result) { + if (_.isObject(result)) { self.do_action(result); } - // always refresh the view after the action + // Always refresh the view after the action // ex: action updates a status var controller = self.getCurrentController(); if (controller && controller.widget) { controller.widget.reload(); } }); - } - else - { + } else { self.do_action(button_definition); } close_func(); }, - } + }; }); }, }); diff --git a/web_ir_actions_act_window_message/static/src/xml/web_ir_actions_act_window_message.xml b/web_ir_actions_act_window_message/static/src/xml/web_ir_actions_act_window_message.xml index 5f0742294..5d6944290 100644 --- a/web_ir_actions_act_window_message/static/src/xml/web_ir_actions_act_window_message.xml +++ b/web_ir_actions_act_window_message/static/src/xml/web_ir_actions_act_window_message.xml @@ -1,5 +1,7 @@
-
+
+ +
diff --git a/web_ir_actions_act_window_message/views/templates.xml b/web_ir_actions_act_window_message/views/templates.xml index 1a096bd27..2a71d18af 100644 --- a/web_ir_actions_act_window_message/views/templates.xml +++ b/web_ir_actions_act_window_message/views/templates.xml @@ -1,13 +1,17 @@ - + - - -