diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css index 40050a72e2d..09079d3a03a 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -2555,6 +2555,12 @@ height: 27px; border-top: 1px solid #ddd; } +.openerp .oe_list_content > tbody > tr.text-bf { + font-weight: bold; +} +.openerp .oe_list_content > tbody > tr.text-it { + font-style: italic; +} .openerp .oe_list_content > tbody > tr > td.oe_list_field_cell { padding: 3px 6px; white-space: pre-line; diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index c619cc15e1e..fe781954510 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -2103,6 +2103,10 @@ $sheet-padding: 16px > tr height: $row-height border-top: 1px solid #ddd + &.text-bf + font-weight: bold + &.text-it + font-style: italic > td.oe_list_field_cell padding: 3px 6px white-space: pre-line diff --git a/addons/web/static/src/js/compatibility.js b/addons/web/static/src/js/compatibility.js index cb1b3b795de..cc80915735a 100644 --- a/addons/web/static/src/js/compatibility.js +++ b/addons/web/static/src/js/compatibility.js @@ -183,6 +183,84 @@ function start_modules (modules) { return openerp; }; +// Monkey-patching of the ListView for backward compatibiliy of the colors and +// fonts row's attributes, as they are deprecated in 9.0. +ListView.include({ + load_list: function(data) { + this._super(data); + if (this.fields_view.arch.attrs.colors) { + this.colors = _(this.fields_view.arch.attrs.colors.split(';')).chain() + .compact() + .map(function(color_pair) { + var pair = color_pair.split(':'), + color = pair[0], + expr = pair[1]; + return [color, py.parse(py.tokenize(expr)), expr]; + }).value(); + } + + if (this.fields_view.arch.attrs.fonts) { + this.fonts = _(this.fields_view.arch.attrs.fonts.split(';')).chain().compact() + .map(function(font_pair) { + var pair = font_pair.split(':'), + font = pair[0], + expr = pair[1]; + return [font, py.parse(py.tokenize(expr)), expr]; + }).value(); + } + }, + /** + * Returns the style for the provided record in the current view (from the + * ``@colors`` and ``@fonts`` attributes) + * + * @param {Record} record record for the current row + * @returns {String} CSS style declaration + */ + style_for: function (record) { + var len, style= ''; + + var context = _.extend({}, record.attributes, { + uid: session.uid, + current_date: moment().format('YYYY-MM-DD') + // TODO: time, datetime, relativedelta + }); + var i; + var pair; + var expression; + if (this.fonts) { + for(i=0, len=this.fonts.length; i= 0; + }); + this.decoration = _.mapObject(this.decoration, function(value) { + return py.parse(py.tokenize(value)); + }); this.setup_columns(this.fields_view.fields, this.grouped); diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml index c5913ce43ed..e0044346686 100644 --- a/addons/web/static/src/xml/base.xml +++ b/addons/web/static/src/xml/base.xml @@ -729,7 +729,8 @@ + t-attf-style="#{(view.fonts || view.colors) ? view.style_for(record) : ''}" + t-attf-class="#{view.compute_decoration_classnames(record)}"> diff --git a/doc/reference/views.rst b/doc/reference/views.rst index f598d8b5321..31f37919e08 100644 --- a/doc/reference/views.rst +++ b/doc/reference/views.rst @@ -141,28 +141,24 @@ root can have the following attributes: ``colors`` - allows changing the color of a row's text based on the corresponding + .. deprecated:: 9.0 + replaced by ``decoration-{$name}`` +``fonts`` + .. deprecated:: 9.0 + replaced by ``decoration-{$name}`` +``decoration-{$name}`` + allow changing the style of a row's text based on the corresponding record's attributes. - Defined as a mapping of colors to Python expressions. Values are of the - form: :samp:`{color}:{expr}[;...]`. For each record, pairs are tested - in-order, the expression is evaluated for the record and if ``true`` the - corresponding color is applied to the row. If no color matches, uses the - default text color (black). + Values are Python expressions. For each record, the expression is evaluated + with the record's attributes as context values and if ``true``, the + corresponding style is applied to the row. Other context values are + ``uid`` (the id of the current user) and ``current_date`` (the current date + as a string of the form ``yyyy-MM-dd``). - * ``color`` can be any valid `CSS color unit`_. - * ``expr`` should be a Python expression evaluated with the current - record's attributes as context values. Other context values are ``uid`` - (the id of the current user) and ``current_date`` (the current date as - a string of the form ``yyyy-MM-dd``) -``fonts`` - allows changing a row's font style based on the corresponding record's - attributes. - - The format is the same as for ``color``, but the ``color`` of each pair - is replaced by ``bold``, ``italic`` or ``underline``, the expression - evaluating to ``true`` will apply the corresponding style to the row's - text. Contrary to ``colors``, multiple pairs can match each record + ``{$name}`` can be ``bf`` (``font-weight: bold``), ``it`` + (``font-style: italic``), or any bootstrap contextual color (``danger``, + ``info``, ``muted``, ``primary``, ``success`` or ``warning``). ``create``, ``edit``, ``delete`` allows *dis*\ abling the corresponding action in the view by setting the corresponding attribute to ``false`` diff --git a/openerp/addons/base/rng/view.rng b/openerp/addons/base/rng/view.rng index ec41227aea1..b62b345c67d 100644 --- a/openerp/addons/base/rng/view.rng +++ b/openerp/addons/base/rng/view.rng @@ -251,6 +251,14 @@ + + + + + + + +