3
0
Fork 0

Reformat the code to have coherent coding style

14.0
Zakaria Makrelouf 2017-05-16 08:56:39 +01:00 committed by koen
parent 96b21892a8
commit 701a9aff9f
1 changed files with 26 additions and 19 deletions

View File

@ -1,7 +1,8 @@
/* Copyright 2017 Therp BV, ACSONE SA/NV /* Copyright 2017 Therp BV, ACSONE SA/NV
* * License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). */ * * 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"; "use strict";
var ActionManager = require('web.ActionManager'), var ActionManager = require('web.ActionManager'),
@ -13,8 +14,8 @@ odoo.define('web.web_ir_actions_act_window_message', function (require) {
var _t = core._t; var _t = core._t;
ActionManager.include({ ActionManager.include({
ir_actions_act_window_message: function(action, options){ ir_actions_act_window_message: function(action, options)
{
var self = this, var self = this,
buttons = []; buttons = [];
@ -34,18 +35,22 @@ odoo.define('web.web_ir_actions_act_window_message', function (require) {
var dialog = new Dialog( var dialog = new Dialog(
this, this,
_.extend({ _.extend(
{
size: 'medium', size: 'medium',
title: action.title, title: action.title,
$content: $('<div>', { $content: $('<div>',
{
text: action.message, text: action.message,
}), }
),
buttons: buttons.concat( buttons: buttons.concat(
this.ir_actions_act_window_message_get_buttons( this.ir_actions_act_window_message_get_buttons(
action, function() { dialog.close() }) action, function() { dialog.close() })
), ),
}, options) },
); options)
)
return dialog.open(); return dialog.open();
}, },
ir_actions_act_window_message_get_buttons: function(action, close_func) ir_actions_act_window_message_get_buttons: function(action, close_func)
@ -59,7 +64,8 @@ odoo.define('web.web_ir_actions_act_window_message', function (require) {
oe_link_class: button_definition.oe_link_class || oe_link_class: button_definition.oe_link_class ||
'oe_highlight', 'oe_highlight',
click: function() { click: function() {
if(button_definition.type == 'method'){ if(button_definition.type == 'method')
{
(new Model(button_definition.model)) (new Model(button_definition.model))
.call( .call(
button_definition.method, button_definition.method,
@ -77,13 +83,14 @@ odoo.define('web.web_ir_actions_act_window_message', function (require) {
.controller.recursive_reload(); .controller.recursive_reload();
}); });
} }
else{ else
{
self.do_action(button_definition); self.do_action(button_definition);
} }
close_func(); close_func();
} },
} }
}); });
} },
}); });
}); });