From aca7ed80a5a00f6034fa774b63d83c51f17a34a5 Mon Sep 17 00:00:00 2001 From: "Turkesh Patel (Open ERP)" Date: Wed, 18 Apr 2012 14:52:54 +0530 Subject: [PATCH] [IMP] Improved code. bzr revid: tpa@tinyerp.com-20120418092254-2htqligvh8ov0qkr --- addons/web/static/src/js/view_list.js | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/addons/web/static/src/js/view_list.js b/addons/web/static/src/js/view_list.js index de8b25fafe8..57268cb947c 100644 --- a/addons/web/static/src/js/view_list.js +++ b/addons/web/static/src/js/view_list.js @@ -148,9 +148,9 @@ instance.web.ListView = instance.web.View.extend( /** @lends instance.web.ListVi * @returns {String} CSS color declaration */ color_for: function (record) { - var style= ''; + var style= ''; - var context = _.extend({}, record.attributes, { + var context = _.extend({}, record.attributes, { uid: this.session.uid, current_date: new Date().toString('yyyy-MM-dd') // TODO: time, datetime, relativedelta @@ -162,9 +162,17 @@ instance.web.ListView = instance.web.View.extend( /** @lends instance.web.ListVi font = pair[0], expression = pair[1]; if (py.evaluate(expression, context).toJSON()) { - if (font == 'bold'){style = 'font-weight: bold;';} - if (font == 'italic'){style = 'font-style: italic;';} - if (font == 'underline'){style = 'text-decoration: underline;';} + switch(font) { + case 'bold': + style += 'font-weight: bold;'; + break; + case 'italic': + style += 'font-style: italic;'; + break; + case 'underline': + style += 'text-decoration: underline;'; + break; + } } } } @@ -175,8 +183,7 @@ instance.web.ListView = instance.web.View.extend( /** @lends instance.web.ListVi color = pair[0], expression = pair[1]; if (py.evaluate(expression, context).toJSON()) { - style += 'color: ' + color + ';' - return style; + return style += 'color: ' + color + ';'; } // TODO: handle evaluation errors }