From 0f264de1499cebb5e33dd7e753b92d0e421afae1 Mon Sep 17 00:00:00 2001 From: Sylvain Calador Date: Tue, 22 Sep 2015 11:02:45 +0200 Subject: [PATCH] [IMP] Add default 'ribbon.name' configuration parameter --- web_environment_ribbon/README.rst | 8 ++++++-- web_environment_ribbon/__openerp__.py | 1 + web_environment_ribbon/data/ribbon_data.xml | 12 ++++++++++++ web_environment_ribbon/static/src/js/ribbon.js | 11 +++++------ web_environment_ribbon/view/base_view.xml | 3 +-- 5 files changed, 25 insertions(+), 10 deletions(-) create mode 100644 web_environment_ribbon/data/ribbon_data.xml diff --git a/web_environment_ribbon/README.rst b/web_environment_ribbon/README.rst index 92cf6da5..a3ecc310 100644 --- a/web_environment_ribbon/README.rst +++ b/web_environment_ribbon/README.rst @@ -17,7 +17,11 @@ Installation Configuration ============= - * No special setup + * You can change the ribbon's name ("TEST") by editing + the default system parameter "ribbon.name" + (in the menu Settings > Parameters > System Parameters) + To hide the ribbon, set this parameter to "False" or + delete it. Usage ===== @@ -30,7 +34,7 @@ Known issues / Roadmap ====================== * Allow to define in some place (system parameter, configuration file...) the - text for the ribbon and the ribbon color. + ribbon color. Bug Tracker =========== diff --git a/web_environment_ribbon/__openerp__.py b/web_environment_ribbon/__openerp__.py index 7252107f..3544d77c 100644 --- a/web_environment_ribbon/__openerp__.py +++ b/web_environment_ribbon/__openerp__.py @@ -31,6 +31,7 @@ ], "data": [ 'view/base_view.xml', + 'data/ribbon_data.xml', ], "update_xml": [], "demo_xml": [], diff --git a/web_environment_ribbon/data/ribbon_data.xml b/web_environment_ribbon/data/ribbon_data.xml new file mode 100644 index 00000000..9ce2b3e6 --- /dev/null +++ b/web_environment_ribbon/data/ribbon_data.xml @@ -0,0 +1,12 @@ + + + + + + + ribbon.name + TEST + + + + diff --git a/web_environment_ribbon/static/src/js/ribbon.js b/web_environment_ribbon/static/src/js/ribbon.js index 6613bf45..48848fc8 100644 --- a/web_environment_ribbon/static/src/js/ribbon.js +++ b/web_environment_ribbon/static/src/js/ribbon.js @@ -22,13 +22,12 @@ openerp.web_environment_ribbon = function(instance) { ribbon.hide(); var model = new instance.web.Model('ir.config_parameter'); - var query = [['key', '=', 'ribbon.name']]; - var fields = ['value']; + var key = 'ribbon.name'; - var res = model.call('search_read', [query, fields]).then( - function (result) { - if (result.length) { - ribbon.html(result[0].value); + var res = model.call('get_param', [key]).then( + function (name) { + if (name && name != 'False') { + ribbon.html(name); ribbon.show(); } } diff --git a/web_environment_ribbon/view/base_view.xml b/web_environment_ribbon/view/base_view.xml index 62896be8..6d9efc9c 100644 --- a/web_environment_ribbon/view/base_view.xml +++ b/web_environment_ribbon/view/base_view.xml @@ -13,10 +13,9 @@ -