From bc7da661793b5ead10c7c46586b51a9cb48893b3 Mon Sep 17 00:00:00 2001 From: Holger Brunn Date: Tue, 22 Mar 2016 10:14:50 +0100 Subject: [PATCH 1/5] delete unused code, move files to standard locations support color_field attribute update manifest higher version number bump typo --- web_tree_dynamic_colored_field/README.rst | 29 +++++++- .../__manifest__.py | 9 ++- .../js/web_tree_dynamic_colored_field.js | 71 ++++++++----------- .../xml/web_tree_dynamic_colored_field.xml | 4 +- .../views/web_tree_dynamic_colored_field.xml | 4 +- 5 files changed, 64 insertions(+), 53 deletions(-) rename web_tree_dynamic_colored_field/static/{ => src}/js/web_tree_dynamic_colored_field.js (51%) rename web_tree_dynamic_colored_field/static/{ => src}/xml/web_tree_dynamic_colored_field.xml (64%) diff --git a/web_tree_dynamic_colored_field/README.rst b/web_tree_dynamic_colored_field/README.rst index 90174e3d..b1a0f354 100644 --- a/web_tree_dynamic_colored_field/README.rst +++ b/web_tree_dynamic_colored_field/README.rst @@ -4,14 +4,20 @@ Colorize field in tree views This module aims to add support for dynamically coloring fields in tree view according to data in the record. -It provides new attributes with the same syntax as 'colors' attribute in tree tag. +It provides attributes on fields with the same syntax as the 'colors' attribute +in tree tags. + +Further, it provides a ``color_field`` attribute on tree tags to use a field's +value as color. Features ======== -* Add attribute 'bg_color' to color background of a cell in tree view +* Add attribute ``bg_color`` on fields to color background of a cell in tree view + +* Add attribute ``fg_color`` on fields to change text color of a cell in tree view -* Add attribute 'fg_color' to change text color of a cell in tree view +* Add attribute ``color_field`` on the tree element to use as color Usage @@ -45,7 +51,23 @@ Usage With this example, column which renders 'name' field will have its text colored in white. +* In the tree view declaration, use color_field="color" attribute in the tree tag:: + + ... + + + ... + + ... + + + ... + With this example, the content of the field named `color` will be used to + populate the `color` CSS value. Use a function field to return whichever + color you want depending on the other record values. Note this this + overrides the `colors` attribute, and that you need the tree to load your + field in the first place by adding it as invisible field. Bug Tracker =========== @@ -63,6 +85,7 @@ Contributors ------------ * Damien Crier +* Holger Brunn Maintainer ---------- diff --git a/web_tree_dynamic_colored_field/__manifest__.py b/web_tree_dynamic_colored_field/__manifest__.py index 45c2be52..891f1c22 100644 --- a/web_tree_dynamic_colored_field/__manifest__.py +++ b/web_tree_dynamic_colored_field/__manifest__.py @@ -19,9 +19,10 @@ # ############################################################################## { - 'name': 'web tree dynamic colored field', + 'name': 'Colorize field in tree views', + 'summary': 'Allows you to dynamically color fields on tree views', 'category': 'Hidden', - 'version': '8.0.1.0.0', + 'version': '8.0.2.0.0', 'depends': ['web'], 'author': "Camptocamp,Odoo Community Association (OCA)", 'license': 'AGPL-3', @@ -30,8 +31,6 @@ 'views/web_tree_dynamic_colored_field.xml', ], 'qweb': [ - 'static/xml/*.xml', + 'static/src/xml/*.xml', ], - 'auto_install': False, - 'installable': False, } diff --git a/web_tree_dynamic_colored_field/static/js/web_tree_dynamic_colored_field.js b/web_tree_dynamic_colored_field/static/src/js/web_tree_dynamic_colored_field.js similarity index 51% rename from web_tree_dynamic_colored_field/static/js/web_tree_dynamic_colored_field.js rename to web_tree_dynamic_colored_field/static/src/js/web_tree_dynamic_colored_field.js index 2c3b5e4f..36b4dac6 100644 --- a/web_tree_dynamic_colored_field/static/js/web_tree_dynamic_colored_field.js +++ b/web_tree_dynamic_colored_field/static/src/js/web_tree_dynamic_colored_field.js @@ -1,8 +1,4 @@ openerp.web_tree_dynamic_colored_field = function(instance){ - var _t = instance.web._t, - _lt = instance.web._lt; - var QWeb = instance.web.qweb; - var pair_colors = function(pair_color){ if (pair_color != ""){ var pair_list = pair_color.split(':'), @@ -12,6 +8,14 @@ openerp.web_tree_dynamic_colored_field = function(instance){ } }; + var get_eval_context = function(record){ + return _.extend( + {}, + record.attributes, + instance.web.pyeval.context() + ); + }; + var colorize_helper = function(obj, record, column, field_attribute, css_attribute){ var result = ''; if (column[field_attribute]){ @@ -22,14 +26,7 @@ openerp.web_tree_dynamic_colored_field = function(instance){ var colors = colors.filter(function CheckUndefined(value, index, ar) { return value != undefined; }) - var ctx = _.extend( - {}, - record.attributes, - { - uid: obj.session.uid, - current_date: new Date().toString('yyyy-MM-dd') - } - ); + var ctx = get_eval_context(record); for(i=0, len=colors.length; i - fct_colorize(record, column) + columns.fct_colorize(record, column) - \ No newline at end of file + diff --git a/web_tree_dynamic_colored_field/views/web_tree_dynamic_colored_field.xml b/web_tree_dynamic_colored_field/views/web_tree_dynamic_colored_field.xml index 4d425fd9..7341731d 100644 --- a/web_tree_dynamic_colored_field/views/web_tree_dynamic_colored_field.xml +++ b/web_tree_dynamic_colored_field/views/web_tree_dynamic_colored_field.xml @@ -5,8 +5,8 @@ - \ No newline at end of file + From 7f43b0831657812a40d8faa2676de447d25adef1 Mon Sep 17 00:00:00 2001 From: OCA Transbot Date: Sun, 3 Jul 2016 20:48:52 -0400 Subject: [PATCH 2/5] OCA Transbot updated translations from Transifex --- web_tree_dynamic_colored_field/i18n/en.po | 23 ++++++++++++++++++++ web_tree_dynamic_colored_field/i18n/es.po | 26 +++++++++++++++++++++++ web_tree_dynamic_colored_field/i18n/fi.po | 26 +++++++++++++++++++++++ web_tree_dynamic_colored_field/i18n/sl.po | 26 +++++++++++++++++++++++ 4 files changed, 101 insertions(+) create mode 100644 web_tree_dynamic_colored_field/i18n/en.po create mode 100644 web_tree_dynamic_colored_field/i18n/es.po create mode 100644 web_tree_dynamic_colored_field/i18n/fi.po create mode 100644 web_tree_dynamic_colored_field/i18n/sl.po diff --git a/web_tree_dynamic_colored_field/i18n/en.po b/web_tree_dynamic_colored_field/i18n/en.po new file mode 100644 index 00000000..8cac9b7d --- /dev/null +++ b/web_tree_dynamic_colored_field/i18n/en.po @@ -0,0 +1,23 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * web_tree_dynamic_colored_field +# +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 8.0\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2016-06-24 00:46+0000\n" +"PO-Revision-Date: 2016-06-24 00:46+0000\n" +"Last-Translator: <>\n" +"Language-Team: \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Plural-Forms: \n" + +#. module: web_tree_dynamic_colored_field +#. openerp-web +#: code:addons/web_tree_dynamic_colored_field/static/src/xml/web_tree_dynamic_colored_field.xml:7 +#, python-format +msgid "columns.fct_colorize(record, column)" +msgstr "columns.fct_colorize(record, column)" diff --git a/web_tree_dynamic_colored_field/i18n/es.po b/web_tree_dynamic_colored_field/i18n/es.po new file mode 100644 index 00000000..6e6aeff9 --- /dev/null +++ b/web_tree_dynamic_colored_field/i18n/es.po @@ -0,0 +1,26 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * web_tree_dynamic_colored_field +# +# Translators: +# Pedro M. Baeza , 2017 +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 9.0c\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2017-01-05 01:38+0000\n" +"PO-Revision-Date: 2017-01-05 01:38+0000\n" +"Last-Translator: Pedro M. Baeza , 2017\n" +"Language-Team: Spanish (https://www.transifex.com/oca/teams/23907/es/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Language: es\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#. module: web_tree_dynamic_colored_field +#. openerp-web +#: code:addons/web_tree_dynamic_colored_field/static/src/xml/web_tree_dynamic_colored_field.xml:7 +#, python-format +msgid "columns.fct_colorize(record, column)" +msgstr "columns.fct_colorize(record, column)" diff --git a/web_tree_dynamic_colored_field/i18n/fi.po b/web_tree_dynamic_colored_field/i18n/fi.po new file mode 100644 index 00000000..acf992c3 --- /dev/null +++ b/web_tree_dynamic_colored_field/i18n/fi.po @@ -0,0 +1,26 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * web_tree_dynamic_colored_field +# +# Translators: +# Jarmo Kortetjärvi , 2016 +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 8.0\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2016-07-08 16:36+0000\n" +"PO-Revision-Date: 2016-07-08 16:36+0000\n" +"Last-Translator: Jarmo Kortetjärvi , 2016\n" +"Language-Team: Finnish (https://www.transifex.com/oca/teams/23907/fi/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Language: fi\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#. module: web_tree_dynamic_colored_field +#. openerp-web +#: code:addons/web_tree_dynamic_colored_field/static/src/xml/web_tree_dynamic_colored_field.xml:7 +#, python-format +msgid "columns.fct_colorize(record, column)" +msgstr "columns.fct_colorize(record, column)" diff --git a/web_tree_dynamic_colored_field/i18n/sl.po b/web_tree_dynamic_colored_field/i18n/sl.po new file mode 100644 index 00000000..c37ce8ab --- /dev/null +++ b/web_tree_dynamic_colored_field/i18n/sl.po @@ -0,0 +1,26 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * web_tree_dynamic_colored_field +# +# Translators: +# Matjaž Mozetič , 2016 +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 8.0\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2016-06-24 00:46+0000\n" +"PO-Revision-Date: 2016-06-24 00:46+0000\n" +"Last-Translator: Matjaž Mozetič , 2016\n" +"Language-Team: Slovenian (https://www.transifex.com/oca/teams/23907/sl/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Language: sl\n" +"Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3);\n" + +#. module: web_tree_dynamic_colored_field +#. openerp-web +#: code:addons/web_tree_dynamic_colored_field/static/src/xml/web_tree_dynamic_colored_field.xml:7 +#, python-format +msgid "columns.fct_colorize(record, column)" +msgstr "columns.fct_colorize(record, column)" From 8f1f745ea2c6da8e2fde04e1c210c7ffc0b74399 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Bidoul=20=28ACSONE=29?= Date: Mon, 15 Aug 2016 22:15:57 +0200 Subject: [PATCH 3/5] remove en.po that was erroneously created by transbot --- web_tree_dynamic_colored_field/i18n/en.po | 23 ----------------------- 1 file changed, 23 deletions(-) delete mode 100644 web_tree_dynamic_colored_field/i18n/en.po diff --git a/web_tree_dynamic_colored_field/i18n/en.po b/web_tree_dynamic_colored_field/i18n/en.po deleted file mode 100644 index 8cac9b7d..00000000 --- a/web_tree_dynamic_colored_field/i18n/en.po +++ /dev/null @@ -1,23 +0,0 @@ -# Translation of Odoo Server. -# This file contains the translation of the following modules: -# * web_tree_dynamic_colored_field -# -msgid "" -msgstr "" -"Project-Id-Version: Odoo Server 8.0\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-06-24 00:46+0000\n" -"PO-Revision-Date: 2016-06-24 00:46+0000\n" -"Last-Translator: <>\n" -"Language-Team: \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: \n" -"Plural-Forms: \n" - -#. module: web_tree_dynamic_colored_field -#. openerp-web -#: code:addons/web_tree_dynamic_colored_field/static/src/xml/web_tree_dynamic_colored_field.xml:7 -#, python-format -msgid "columns.fct_colorize(record, column)" -msgstr "columns.fct_colorize(record, column)" From 1eea6d36673d456f183a068effc8b8df3789c15a Mon Sep 17 00:00:00 2001 From: Holger Brunn Date: Tue, 8 Nov 2016 15:48:21 +0100 Subject: [PATCH 4/5] web_tree_dynamic_colored_field v9 demo view --- web_tree_dynamic_colored_field/README.rst | 17 +++--- web_tree_dynamic_colored_field/__init__.py | 21 +------- .../__manifest__.py | 32 ++++-------- .../demo/res_users.xml | 22 ++++++++ .../src/js/web_tree_dynamic_colored_field.js | 52 +++++++++++++------ 5 files changed, 77 insertions(+), 67 deletions(-) create mode 100644 web_tree_dynamic_colored_field/demo/res_users.xml diff --git a/web_tree_dynamic_colored_field/README.rst b/web_tree_dynamic_colored_field/README.rst index b1a0f354..ccc59f9b 100644 --- a/web_tree_dynamic_colored_field/README.rst +++ b/web_tree_dynamic_colored_field/README.rst @@ -65,18 +65,17 @@ Usage With this example, the content of the field named `color` will be used to populate the `color` CSS value. Use a function field to return whichever - color you want depending on the other record values. Note this this + color you want depending on the other record values. Note that this overrides the `colors` attribute, and that you need the tree to load your field in the first place by adding it as invisible field. Bug Tracker =========== -Bugs are tracked on `GitHub Issues `_. -In case of trouble, please check there if your issue has already been reported. -If you spotted it first, help us smashing it by providing a detailed and welcomed feedback -`here `_. - +Bugs are tracked on `GitHub Issues +`_. In case of trouble, please +check there if your issue has already been reported. If you spotted it first, +help us smashing it by providing a detailed and welcomed feedback. Credits ======= @@ -90,9 +89,9 @@ Contributors Maintainer ---------- -.. image:: http://odoo-community.org/logo.png +.. image:: https://odoo-community.org/logo.png :alt: Odoo Community Association - :target: http://odoo-community.org + :target: https://odoo-community.org This module is maintained by the OCA. @@ -100,4 +99,4 @@ 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 https://odoo-community.org. diff --git a/web_tree_dynamic_colored_field/__init__.py b/web_tree_dynamic_colored_field/__init__.py index c82f5352..ed8d9eff 100644 --- a/web_tree_dynamic_colored_field/__init__.py +++ b/web_tree_dynamic_colored_field/__init__.py @@ -1,20 +1,3 @@ # -*- coding: utf-8 -*- -############################################################################## -# -# Author: Damien Crier -# Copyright 2015 Camptocamp SA -# -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU Affero General Public License as -# published by the Free Software Foundation, either version 3 of the -# License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Affero General Public License for more details. -# -# You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see . -# -############################################################################## +# © 2015 Camptocamp SA, Damien Crier +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). diff --git a/web_tree_dynamic_colored_field/__manifest__.py b/web_tree_dynamic_colored_field/__manifest__.py index 891f1c22..f9e326e0 100644 --- a/web_tree_dynamic_colored_field/__manifest__.py +++ b/web_tree_dynamic_colored_field/__manifest__.py @@ -1,32 +1,18 @@ # -*- coding: utf-8 -*- -############################################################################## -# -# Author: Damien Crier -# Copyright 2015 Camptocamp SA -# -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU Affero General Public License as -# published by the Free Software Foundation, either version 3 of the -# License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Affero General Public License for more details. -# -# You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see . -# -############################################################################## +# © 2015 Camptocamp SA, Damien Crier +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). { 'name': 'Colorize field in tree views', 'summary': 'Allows you to dynamically color fields on tree views', - 'category': 'Hidden', - 'version': '8.0.2.0.0', + 'category': 'Hidden/Dependency', + 'version': '9.0.2.0.0', 'depends': ['web'], - 'author': "Camptocamp,Odoo Community Association (OCA)", + 'author': "Camptocamp,Therp BV,Odoo Community Association (OCA)", 'license': 'AGPL-3', - 'website': 'http://www.camptocamp.com', + 'website': 'https://github.com/OCA/web', + 'demo': [ + "demo/res_users.xml", + ], 'data': [ 'views/web_tree_dynamic_colored_field.xml', ], diff --git a/web_tree_dynamic_colored_field/demo/res_users.xml b/web_tree_dynamic_colored_field/demo/res_users.xml new file mode 100644 index 00000000..8bcf9141 --- /dev/null +++ b/web_tree_dynamic_colored_field/demo/res_users.xml @@ -0,0 +1,22 @@ + + + + + res.users + + + + lang + + + red: login_date == False + white: login_date == False + + + red: login == 'admin' + white: login == 'admin' + + + + + diff --git a/web_tree_dynamic_colored_field/static/src/js/web_tree_dynamic_colored_field.js b/web_tree_dynamic_colored_field/static/src/js/web_tree_dynamic_colored_field.js index 36b4dac6..1d3a9273 100644 --- a/web_tree_dynamic_colored_field/static/src/js/web_tree_dynamic_colored_field.js +++ b/web_tree_dynamic_colored_field/static/src/js/web_tree_dynamic_colored_field.js @@ -1,10 +1,16 @@ -openerp.web_tree_dynamic_colored_field = function(instance){ +odoo.define('web_tree_dynamic_colored_field', function(require) +{ + 'use strict'; + var ListView = require('web.ListView'), + pyeval = require('web.pyeval'), + py = window.py; + var pair_colors = function(pair_color){ - if (pair_color != ""){ + if (pair_color !== ""){ var pair_list = pair_color.split(':'), color = pair_list[0], expression = pair_list[1]; - return [color, py.parse(py.tokenize(expression)), expression] + return [color, py.parse(py.tokenize(expression)), expression]; } }; @@ -12,7 +18,7 @@ openerp.web_tree_dynamic_colored_field = function(instance){ return _.extend( {}, record.attributes, - instance.web.pyeval.context() + pyeval.context() ); }; @@ -22,21 +28,21 @@ openerp.web_tree_dynamic_colored_field = function(instance){ var colors = _(column[field_attribute].split(';')) .chain() .map(pair_colors) - .value(); - var colors = colors.filter(function CheckUndefined(value, index, ar) { - return value != undefined; - }) + .value() + .filter(function CheckUndefined(value, index, ar) { + return value !== undefined; + }); var ctx = get_eval_context(record); - for(i=0, len=colors.length; i Date: Mon, 22 May 2017 19:02:44 +0200 Subject: [PATCH 5/5] Migration of web_tree_dynamic_colored_field to 10.0 --- .../__manifest__.py | 2 +- .../demo/res_users.xml | 38 +++++++++---------- .../views/web_tree_dynamic_colored_field.xml | 16 ++++---- 3 files changed, 26 insertions(+), 30 deletions(-) diff --git a/web_tree_dynamic_colored_field/__manifest__.py b/web_tree_dynamic_colored_field/__manifest__.py index f9e326e0..43e967fb 100644 --- a/web_tree_dynamic_colored_field/__manifest__.py +++ b/web_tree_dynamic_colored_field/__manifest__.py @@ -5,7 +5,7 @@ 'name': 'Colorize field in tree views', 'summary': 'Allows you to dynamically color fields on tree views', 'category': 'Hidden/Dependency', - 'version': '9.0.2.0.0', + 'version': '10.0.1.0.0', 'depends': ['web'], 'author': "Camptocamp,Therp BV,Odoo Community Association (OCA)", 'license': 'AGPL-3', diff --git a/web_tree_dynamic_colored_field/demo/res_users.xml b/web_tree_dynamic_colored_field/demo/res_users.xml index 8bcf9141..806b8767 100644 --- a/web_tree_dynamic_colored_field/demo/res_users.xml +++ b/web_tree_dynamic_colored_field/demo/res_users.xml @@ -1,22 +1,20 @@ - - - - res.users - - - - lang - - - red: login_date == False - white: login_date == False - - - red: login == 'admin' - white: login == 'admin' - + + + res.users + + + + lang + + + red: login_date == False + white: login_date == False - - - + + red: login == 'admin' + white: login == 'admin' + + + + diff --git a/web_tree_dynamic_colored_field/views/web_tree_dynamic_colored_field.xml b/web_tree_dynamic_colored_field/views/web_tree_dynamic_colored_field.xml index 7341731d..c634300c 100644 --- a/web_tree_dynamic_colored_field/views/web_tree_dynamic_colored_field.xml +++ b/web_tree_dynamic_colored_field/views/web_tree_dynamic_colored_field.xml @@ -1,12 +1,10 @@ - - - - - + + +