From 7f504a1b2221717f59d752295a31cc4aff52bc6c Mon Sep 17 00:00:00 2001 From: Damien Crier Date: Tue, 4 Aug 2015 09:07:23 +0200 Subject: [PATCH 01/16] [IMP] rename module to 'web_tree_dynamic_colored_field' --- web_tree_dynamic_colored_field/README.rst | 80 ++++++++++++++++ web_tree_dynamic_colored_field/__init__.py | 20 ++++ web_tree_dynamic_colored_field/__openerp__.py | 37 ++++++++ .../static/description/icon.png | Bin 0 -> 9455 bytes .../js/web_tree_dynamic_colored_field.js | 86 ++++++++++++++++++ .../xml/web_tree_dynamic_colored_field.xml | 11 +++ .../views/web_tree_dynamic_colored_field.xml | 12 +++ 7 files changed, 246 insertions(+) create mode 100644 web_tree_dynamic_colored_field/README.rst create mode 100644 web_tree_dynamic_colored_field/__init__.py create mode 100644 web_tree_dynamic_colored_field/__openerp__.py create mode 100644 web_tree_dynamic_colored_field/static/description/icon.png create mode 100644 web_tree_dynamic_colored_field/static/js/web_tree_dynamic_colored_field.js create mode 100644 web_tree_dynamic_colored_field/static/xml/web_tree_dynamic_colored_field.xml create mode 100644 web_tree_dynamic_colored_field/views/web_tree_dynamic_colored_field.xml diff --git a/web_tree_dynamic_colored_field/README.rst b/web_tree_dynamic_colored_field/README.rst new file mode 100644 index 00000000..90174e3d --- /dev/null +++ b/web_tree_dynamic_colored_field/README.rst @@ -0,0 +1,80 @@ +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. + +Features +======== + +* Add attribute 'bg_color' to color background of a cell in tree view + +* Add attribute 'fg_color' to change text color of a cell in tree view + + +Usage +===== + +* In the tree view declaration, put bg_color="red:customer==True;" attribute in the field tag:: + + ... + + + ... + + ... + + + ... + + With this example, column which renders 'name' field will have its background colored in red. + +* In the tree view declaration, put fg_color="white:customer==True;" attribute in the field tag:: + + ... + + + ... + + ... + + + ... + + With this example, column which renders 'name' field will have its text colored in white. + + + +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 `_. + + +Credits +======= + +Contributors +------------ + +* Damien Crier + +Maintainer +---------- + +.. image:: http://odoo-community.org/logo.png + :alt: Odoo Community Association + :target: http://odoo-community.org + +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. + +To contribute to this module, please visit http://odoo-community.org. diff --git a/web_tree_dynamic_colored_field/__init__.py b/web_tree_dynamic_colored_field/__init__.py new file mode 100644 index 00000000..c82f5352 --- /dev/null +++ b/web_tree_dynamic_colored_field/__init__.py @@ -0,0 +1,20 @@ +# -*- 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 . +# +############################################################################## diff --git a/web_tree_dynamic_colored_field/__openerp__.py b/web_tree_dynamic_colored_field/__openerp__.py new file mode 100644 index 00000000..45c2be52 --- /dev/null +++ b/web_tree_dynamic_colored_field/__openerp__.py @@ -0,0 +1,37 @@ +# -*- 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 . +# +############################################################################## +{ + 'name': 'web tree dynamic colored field', + 'category': 'Hidden', + 'version': '8.0.1.0.0', + 'depends': ['web'], + 'author': "Camptocamp,Odoo Community Association (OCA)", + 'license': 'AGPL-3', + 'website': 'http://www.camptocamp.com', + 'data': [ + 'views/web_tree_dynamic_colored_field.xml', + ], + 'qweb': [ + 'static/xml/*.xml', + ], + 'auto_install': False, + 'installable': False, +} diff --git a/web_tree_dynamic_colored_field/static/description/icon.png b/web_tree_dynamic_colored_field/static/description/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..3a0328b516c4980e8e44cdb63fd945757ddd132d GIT binary patch literal 9455 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 z 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 Xviia!U7SGha1wx#SCgwmn*{w2TRX*I literal 0 HcmV?d00001 diff --git a/web_tree_dynamic_colored_field/static/js/web_tree_dynamic_colored_field.js b/web_tree_dynamic_colored_field/static/js/web_tree_dynamic_colored_field.js new file mode 100644 index 00000000..2c3b5e4f --- /dev/null +++ b/web_tree_dynamic_colored_field/static/js/web_tree_dynamic_colored_field.js @@ -0,0 +1,86 @@ +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(':'), + color = pair_list[0], + expression = pair_list[1]; + return [color, py.parse(py.tokenize(expression)), expression] + } + }; + + var colorize_helper = function(obj, record, column, field_attribute, css_attribute){ + var result = ''; + if (column[field_attribute]){ + var colors = _(column[field_attribute].split(';')) + .chain() + .map(pair_colors) + .value(); + 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') + } + ); + for(i=0, len=colors.length; i + + + + + + 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 new file mode 100644 index 00000000..4d425fd9 --- /dev/null +++ b/web_tree_dynamic_colored_field/views/web_tree_dynamic_colored_field.xml @@ -0,0 +1,12 @@ + + + + + + + \ No newline at end of file From e4e27d4adb837321cd3424ce8f0036cb9ac8c67c Mon Sep 17 00:00:00 2001 From: Holger Brunn Date: Tue, 22 Mar 2016 10:14:50 +0100 Subject: [PATCH 02/16] 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 +++++++- web_tree_dynamic_colored_field/__openerp__.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/__openerp__.py b/web_tree_dynamic_colored_field/__openerp__.py index 45c2be52..891f1c22 100644 --- a/web_tree_dynamic_colored_field/__openerp__.py +++ b/web_tree_dynamic_colored_field/__openerp__.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 49afbd25ff382ba75fc9f76203f45a27af4e57eb Mon Sep 17 00:00:00 2001 From: OCA Transbot Date: Sun, 3 Jul 2016 20:48:52 -0400 Subject: [PATCH 03/16] OCA Transbot updated translations from Transifex --- 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 +++++++++++++++++++++++ 3 files changed, 78 insertions(+) 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/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 e8706b1e27fb841e385d2109f0b7e17e1db86df8 Mon Sep 17 00:00:00 2001 From: Holger Brunn Date: Tue, 8 Nov 2016 15:48:21 +0100 Subject: [PATCH 04/16] web_tree_dynamic_colored_field v9 demo view --- web_tree_dynamic_colored_field/README.rst | 17 +++--- web_tree_dynamic_colored_field/__init__.py | 21 +------- web_tree_dynamic_colored_field/__openerp__.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/__openerp__.py b/web_tree_dynamic_colored_field/__openerp__.py index 891f1c22..f9e326e0 100644 --- a/web_tree_dynamic_colored_field/__openerp__.py +++ b/web_tree_dynamic_colored_field/__openerp__.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 05/16] Migration of web_tree_dynamic_colored_field to 10.0 --- .../{__openerp__.py => __manifest__.py} | 2 +- .../demo/res_users.xml | 38 +++++++++---------- .../views/web_tree_dynamic_colored_field.xml | 16 ++++---- 3 files changed, 26 insertions(+), 30 deletions(-) rename web_tree_dynamic_colored_field/{__openerp__.py => __manifest__.py} (95%) diff --git a/web_tree_dynamic_colored_field/__openerp__.py b/web_tree_dynamic_colored_field/__manifest__.py similarity index 95% rename from web_tree_dynamic_colored_field/__openerp__.py rename to web_tree_dynamic_colored_field/__manifest__.py index f9e326e0..43e967fb 100644 --- a/web_tree_dynamic_colored_field/__openerp__.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 @@ - - - - - + + + From 6e05aa7e18b8f3aea5a350f2e8871507734abb49 Mon Sep 17 00:00:00 2001 From: OCA Transbot Date: Sat, 24 Jun 2017 12:40:00 +0200 Subject: [PATCH 06/16] OCA Transbot updated translations from Transifex --- web_tree_dynamic_colored_field/i18n/nl_NL.po | 26 ++++++++++++++++++++ 1 file changed, 26 insertions(+) create mode 100644 web_tree_dynamic_colored_field/i18n/nl_NL.po diff --git a/web_tree_dynamic_colored_field/i18n/nl_NL.po b/web_tree_dynamic_colored_field/i18n/nl_NL.po new file mode 100644 index 00000000..edc9e2e2 --- /dev/null +++ b/web_tree_dynamic_colored_field/i18n/nl_NL.po @@ -0,0 +1,26 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * web_tree_dynamic_colored_field +# +# Translators: +# Peter Hageman , 2017 +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 10.0\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2017-06-22 08:27+0000\n" +"PO-Revision-Date: 2017-06-22 08:27+0000\n" +"Last-Translator: Peter Hageman , 2017\n" +"Language-Team: Dutch (Netherlands) (https://www.transifex.com/oca/teams/23907/nl_NL/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Language: nl_NL\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)" From c5f86b1c232706146adaa46ea6d3cc65f6f80db6 Mon Sep 17 00:00:00 2001 From: Artem Kostyuk Date: Tue, 20 Feb 2018 18:16:37 +0200 Subject: [PATCH 07/16] [MIG] web_tree_dynamic_colored_field: Migration to 11.0 --- web_tree_dynamic_colored_field/README.rst | 49 +++-- web_tree_dynamic_colored_field/__init__.py | 3 +- .../__manifest__.py | 11 +- .../demo/res_users.xml | 26 ++- web_tree_dynamic_colored_field/i18n/es.po | 26 --- web_tree_dynamic_colored_field/i18n/fi.po | 26 --- web_tree_dynamic_colored_field/i18n/nl_NL.po | 26 --- web_tree_dynamic_colored_field/i18n/sl.po | 26 --- .../src/js/web_tree_dynamic_colored_field.js | 198 ++++++++++-------- .../xml/web_tree_dynamic_colored_field.xml | 11 - .../views/web_tree_dynamic_colored_field.xml | 2 - 11 files changed, 163 insertions(+), 241 deletions(-) delete mode 100644 web_tree_dynamic_colored_field/i18n/es.po delete mode 100644 web_tree_dynamic_colored_field/i18n/fi.po delete mode 100644 web_tree_dynamic_colored_field/i18n/nl_NL.po delete mode 100644 web_tree_dynamic_colored_field/i18n/sl.po delete mode 100644 web_tree_dynamic_colored_field/static/src/xml/web_tree_dynamic_colored_field.xml diff --git a/web_tree_dynamic_colored_field/README.rst b/web_tree_dynamic_colored_field/README.rst index ccc59f9b..d661197c 100644 --- a/web_tree_dynamic_colored_field/README.rst +++ b/web_tree_dynamic_colored_field/README.rst @@ -1,35 +1,37 @@ +.. image:: https://img.shields.io/badge/license-LGPL--3-blue.svg + :target: http://www.gnu.org/licenses/lgpl-3.0-standalone.html + :alt: License: LGPL-3 + +============================ 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 attributes on fields with the same syntax as the 'colors' attribute +It provides attributes on fields with the similar 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. +Further, it provides a ``color_field`` attribute on tree tags's ``colors`` to use +a field's value as color. Features ======== -* 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 ``color_field`` on the tree element to use as color - +* Add attribute ``bg_color`` on field's ``options`` to color background of a cell in tree view +* Add attribute ``fg_color`` on field's ``options`` to change text color of a cell in tree view +* Add attribute ``color_field`` on the tree element's ``colors`` to use as color Usage ===== -* In the tree view declaration, put bg_color="red:customer==True;" attribute in the field tag:: +* In the tree view declaration, put ``options='"bg_color": "red: customer==True"`` attribute in the ``field`` tag:: ... ... - + ... @@ -37,37 +39,39 @@ Usage With this example, column which renders 'name' field will have its background colored in red. -* In the tree view declaration, put fg_color="white:customer==True;" attribute in the field tag:: +* In the tree view declaration, put ``options='"fg_color": "white:customer == True"'`` attribute in the ``field`` tag:: ... ... - + ... ... - With this example, column which renders 'name' field will have its text colored in white. + With this example, column which renders 'name' field will have its text colored in white on a customer records. -* In the tree view declaration, use color_field="color" attribute in the tree tag:: +* In the tree view declaration, use ``options='"color_field": "my_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 + With this example, the content of the field named `my_color` will be used to + populate the `my_color` CSS value. Use a function field to return whichever 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. + overrides the rest of `colors` attributes, and that you need the tree + to load your field in the first place by adding it as invisible field. + +**Note that you should always use single quotes for fields' ``options`` and wrap nested values in double quotes since ``options`` is a JSON object.** Bug Tracker =========== @@ -75,7 +79,7 @@ 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. +help us smash it by providing a detailed and welcomed feedback. Credits ======= @@ -85,6 +89,7 @@ Contributors * Damien Crier * Holger Brunn +* Artem Kostyuk Maintainer ---------- diff --git a/web_tree_dynamic_colored_field/__init__.py b/web_tree_dynamic_colored_field/__init__.py index ed8d9eff..8945c43c 100644 --- a/web_tree_dynamic_colored_field/__init__.py +++ b/web_tree_dynamic_colored_field/__init__.py @@ -1,3 +1,2 @@ -# -*- coding: utf-8 -*- -# © 2015 Camptocamp SA, Damien Crier +# Copyright 2015-2018 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 43e967fb..665310b8 100644 --- a/web_tree_dynamic_colored_field/__manifest__.py +++ b/web_tree_dynamic_colored_field/__manifest__.py @@ -1,13 +1,12 @@ -# -*- coding: utf-8 -*- -# © 2015 Camptocamp SA, Damien Crier +# Copyright 2015-2018 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/Dependency', - 'version': '10.0.1.0.0', + 'version': '11.0.1.0.0', 'depends': ['web'], - 'author': "Camptocamp,Therp BV,Odoo Community Association (OCA)", + 'author': "Camptocamp, Therp BV, Odoo Community Association (OCA)", 'license': 'AGPL-3', 'website': 'https://github.com/OCA/web', 'demo': [ @@ -16,7 +15,5 @@ 'data': [ 'views/web_tree_dynamic_colored_field.xml', ], - 'qweb': [ - 'static/src/xml/*.xml', - ], + 'installable': True, } diff --git a/web_tree_dynamic_colored_field/demo/res_users.xml b/web_tree_dynamic_colored_field/demo/res_users.xml index 806b8767..ef364722 100644 --- a/web_tree_dynamic_colored_field/demo/res_users.xml +++ b/web_tree_dynamic_colored_field/demo/res_users.xml @@ -4,17 +4,21 @@ res.users - - lang - - - red: login_date == False - white: login_date == False - - - red: login == 'admin' - white: login == 'admin' - + + color_field: lang + + + { + "bg_color": "#9e1635: login_date == False", + "fg_color": "white: login_date == False" + } + + + { + "bg_color": "blue; #653b5b: login == 'admin'", + "fg_color": "white" + } + diff --git a/web_tree_dynamic_colored_field/i18n/es.po b/web_tree_dynamic_colored_field/i18n/es.po deleted file mode 100644 index 6e6aeff9..00000000 --- a/web_tree_dynamic_colored_field/i18n/es.po +++ /dev/null @@ -1,26 +0,0 @@ -# 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 deleted file mode 100644 index acf992c3..00000000 --- a/web_tree_dynamic_colored_field/i18n/fi.po +++ /dev/null @@ -1,26 +0,0 @@ -# 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/nl_NL.po b/web_tree_dynamic_colored_field/i18n/nl_NL.po deleted file mode 100644 index edc9e2e2..00000000 --- a/web_tree_dynamic_colored_field/i18n/nl_NL.po +++ /dev/null @@ -1,26 +0,0 @@ -# Translation of Odoo Server. -# This file contains the translation of the following modules: -# * web_tree_dynamic_colored_field -# -# Translators: -# Peter Hageman , 2017 -msgid "" -msgstr "" -"Project-Id-Version: Odoo Server 10.0\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-06-22 08:27+0000\n" -"PO-Revision-Date: 2017-06-22 08:27+0000\n" -"Last-Translator: Peter Hageman , 2017\n" -"Language-Team: Dutch (Netherlands) (https://www.transifex.com/oca/teams/23907/nl_NL/)\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: \n" -"Language: nl_NL\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 deleted file mode 100644 index c37ce8ab..00000000 --- a/web_tree_dynamic_colored_field/i18n/sl.po +++ /dev/null @@ -1,26 +0,0 @@ -# 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)" 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 1d3a9273..2a96aba6 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,95 +1,129 @@ -odoo.define('web_tree_dynamic_colored_field', function(require) -{ +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 !== ""){ - var pair_list = pair_color.split(':'), - color = pair_list[0], - expression = pair_list[1]; - return [color, py.parse(py.tokenize(expression)), expression]; - } - }; - - var get_eval_context = function(record){ - return _.extend( - {}, - record.attributes, - pyeval.context() - ); - }; + var ListRenderer = require('web.ListRenderer'); + var pyeval = require('web.pyeval'); - var colorize_helper = function(obj, record, column, field_attribute, css_attribute){ - var result = ''; - if (column[field_attribute]){ - var colors = _(column[field_attribute].split(';')) - .chain() - .map(pair_colors) - .value() - .filter(function CheckUndefined(value, index, ar) { - return value !== undefined; - }); - var ctx = get_eval_context(record); - for(var i=0, len=colors.length; i color.trim().startsWith('color_field'))[0] + .split(':')[1] + .trim(); + // validate the presence of that field in tree view + var fieldNames = _(this.columns).map( + (value) => { return value.attrs.name; } + ); + if (fieldNames.indexOf(colorField) === -1) { + console.warn( + "No field named '" + colorField + "' present in view." + ); + } else { + this.colorField = colorField; } } - } - return result; - }; - - var colorize = function(record, column){ - var res = ''; - res += colorize_helper(this, record, column, 'bg_color', 'background-color'); - res += colorize_helper(this, record, column, 'fg_color', 'color'); - return res; - }; - - ListView.List.include({ - init: function(group, opts){ - this._super(group, opts); - this.columns.fct_colorize = colorize; + return this._super(); + }, + /** + * Colorize a cell during it's render + * + * @override + */ + _renderBodyCell: function (record, node, colIndex, options) { + var $td = this._super.apply(this, arguments); + var ctx = this.getEvalContext(record); + this.applyColorize($td, record, node, ctx); + return $td; }, - }); - ListView.include({ - load_view: function() - { - var self = this; - return this._super.apply(this, arguments) - .then(function() - { - // the style_for helper is only called if one of colors or - // fonts is not null - if(self.fields_view.arch.attrs.color_field) - { - self.colors = []; - } - }); + /** + * Colorize the current cell depending on expressions provided. + * + * @param {Query Node} $td a tag inside a table representing a list view + * @param {Object} node an XML node (must be a ) + */ + applyColorize: function ($td, record, node, ctx) { + // safely resolve value of `color_field` given in + var treeColor = record.data[this.colorField]; + if (treeColor) { + $td.css('color', treeColor); + } + // apply 's own `options` + if (!node.attrs.options) { return; } + var nodeOptions = JSON.parse(node.attrs.options); + this.applyColorizeHelper($td, nodeOptions, node, 'fg_color', 'color', ctx); + this.applyColorizeHelper($td, nodeOptions, node, 'bg_color', 'background-color', ctx); }, - style_for: function (record) - { - var result = this._super.apply(this, arguments); - if(this.fields_view.arch.attrs.color_field) - { - var color = py.evaluate( - py.parse(py.tokenize( - this.fields_view.arch.attrs.color_field - )), - get_eval_context(record)).toJSON(); - if(color) - { - result += 'color: ' + color; + /** + * @param {Object} nodeOptions a mapping of nodeOptions parameters to the color itself + * @param {Object} node an XML node (must be a ) + * @param {string} nodeAttribute an attribute of a node to apply a style onto + * @param {string} cssAttribute a real CSS-compatible attribute + */ + applyColorizeHelper: function ($td, nodeOptions, node, nodeAttribute, cssAttribute, ctx) { + if (nodeOptions[nodeAttribute]) { + var colors = _(nodeOptions[nodeAttribute].split(';')) + .chain() + .map(this.pairColors) + .value() + .filter(function CheckUndefined(value, index, ar) { + return value !== undefined; + }); + for (var i=0, len=colors.length; i: ` forms to + * evaluatable expressions + * + * @param {string} pairColor `color: expression` pair + */ + pairColors: function (pairColor) { + if (pairColor !== "") { + var pairList = pairColor.split(':'), + color = pairList[0], + // if one passes a bare color instead of an expression, + // then we consider that color is to be shown in any case + expression = pairList[1]? pairList[1] : 'True'; + return [color, py.parse(py.tokenize(expression)), expression]; + } + return undefined; + }, + /** + * Construct domain evaluation context, mostly by passing + * record's fields's values to local scope. + * + * @param {Object} record a record to build a context from + */ + getEvalContext: function (record) { + var ctx = _.extend( + {}, + record.data, + pyeval.context() + ); + for (var key in ctx) { + var value = ctx[key]; + if (ctx[key] instanceof moment) { + // date/datetime fields are represented w/ Moment objects + // docs: https://momentjs.com/ + ctx[key] = value.format('YYYY-MM-DD hh:mm:ss'); + } + } + return ctx; + } }); }); diff --git a/web_tree_dynamic_colored_field/static/src/xml/web_tree_dynamic_colored_field.xml b/web_tree_dynamic_colored_field/static/src/xml/web_tree_dynamic_colored_field.xml deleted file mode 100644 index 254172e8..00000000 --- a/web_tree_dynamic_colored_field/static/src/xml/web_tree_dynamic_colored_field.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - columns.fct_colorize(record, column) - - - - 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 c634300c..ea8e1129 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,6 +1,4 @@ -