Techsystech
/
web
mirror of https://github.com/OCA/web.git
3
0
Fork 1
Code Issues Packages Projects Releases Wiki Activity

[MIG] web_ir_actions_act_window_message: Migration to 10. Also added HTML handling

pull/1619/head
Benjamin Willig 2017-05-23 17:25:01 +02:00 committed by Thomas Binsfeld
parent c9c61f1419
commit e807e5ecd4
3 changed files with 22 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
web_ir_actions_act_window_message/README.rst
View File

@ -19,6 +19,8 @@ Depend on this module and return
# you can create your own close button with an action of type # you can create your own close button with an action of type
# ir.actions.act_window_close # ir.actions.act_window_close
'close_button_title': 'Make this window go away', 'close_button_title': 'Make this window go away',
# Use HTML instead of text
'is_html_message': True,
# this is an optional list of buttons to show # this is an optional list of buttons to show
'buttons': [ 'buttons': [
# a button can be any action (also ir.actions.report.xml et al) # a button can be any action (also ir.actions.report.xml et al)
@ -73,6 +75,7 @@ Contributors
* Holger Brunn <hbrunn@therp.nl> * Holger Brunn <hbrunn@therp.nl>
* Zakaria Makrelouf (ACSONE SA/NV) <z.makrelouf@gmail.com> * Zakaria Makrelouf (ACSONE SA/NV) <z.makrelouf@gmail.com>
* Benjamin Willig (ACSONE SA/NV) <benjamin.willig@acsone.eu>
Maintainer Maintainer
---------- ----------
@ -85,4 +88,4 @@ This module is maintained by the OCA.
OCA, or the Odoo Community Association, is a nonprofit organization whose mission is to support the collaborative development of Odoo features and promote its widespread use. OCA, or the Odoo Community Association, is a nonprofit organization whose mission is to support the collaborative development of Odoo features and promote its widespread use.
To contribute to this module, please visit http://odoo-community.org. To contribute to this module, please visit http://odoo-community.org.

2
web_ir_actions_act_window_message/__manifest__.py
View File

@ -3,7 +3,7 @@
# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
{ {
"name": "Client side message boxes", "name": "Client side message boxes",
"version": "9.0.1.0.0", "version": "10.0.1.0.0",
"author": "Therp BV, " "author": "Therp BV, "
"ACSONE SA/NV, " "ACSONE SA/NV, "
"Odoo Community Association (OCA)", "Odoo Community Association (OCA)",

26
web_ir_actions_act_window_message/static/src/js/web_ir_actions_act_window_message.js
View File

@ -7,7 +7,6 @@ odoo.define('web.web_ir_actions_act_window_message', function(require)
var ActionManager = require('web.ActionManager'), var ActionManager = require('web.ActionManager'),
core = require('web.core'), core = require('web.core'),
_ = require('_'),
Model = require('web.Model'), Model = require('web.Model'),
Dialog = require('web.Dialog'); Dialog = require('web.Dialog');
@ -33,20 +32,29 @@ odoo.define('web.web_ir_actions_act_window_message', function(require)
}) })
} }
var is_html = action.is_html_message === true;
var content_properties = {};
if (is_html) {
content_properties = {
html: action.message,
};
} else {
content_properties = {
text: action.message,
css: {
'white-space': 'pre-line',
}
};
}
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>', content_properties),
{
text: action.message,
css: {
'white-space': 'pre-line',
}
}
),
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() })