From 8d509498b6ee28c96866b76803b07bce00114329 Mon Sep 17 00:00:00 2001
From: "RGA(OpenERP)" <>
Date: Mon, 16 Dec 2013 18:26:02 +0530
Subject: [PATCH 01/10] [IMP] add stage mode widget

bzr revid: rgaopenerp-20131216125602-r10t3se7hgvoy73w
---
 addons/web/static/src/js/view_form.js | 40 ++++++++++++++++++++++++++-
 addons/web/static/src/xml/base.xml    | 25 +++++++++++++++++
 2 files changed, 64 insertions(+), 1 deletion(-)

diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js
index f20e9053867..d772cbb55cd 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -2330,7 +2330,44 @@ instance.web.form.FieldChar = instance.web.form.AbstractField.extend(instance.we
         });
     }
 });
-
+instance.web.form.StageMode = instance.web.form.FieldChar.extend({
+    init: function (field_manager, node) {
+        this._super(field_manager, node);
+        this.options = py.eval(node.attrs.options) 
+        this.stage_dataset  = new instance.web.DataSetStatic(this, this.options.stage_model, this.build_context());
+        this.stage_field = this.options.stage_field;
+    },
+    
+    get_stage_value: function(){
+        var def = $.Deferred();
+        var stage_id = this.field_manager.fields[this.stage_field].get_value()
+        this.stage_dataset.call('search_read', [[[this.stage_field,'=', stage_id],['type','=',this.name]]]).then(function (res){
+                    def.resolve(res);
+                })
+        return def
+    },
+    
+    render_value: function() {
+        var self = this;
+        self.get_stage_value().then(function (res){
+            var content = QWeb.render("StageMode."+self.name, {
+                'widget': self, 
+                'res': res,
+                });
+            self.$el.html(content);
+            self.$el.find("li").click(self.execute_action.bind(self));
+        })
+    },
+    execute_action: function(e){
+        e.preventDefault();
+        var self = this;
+        $this = $(e.target)
+        var value = $this.data('value') || $this.parent().data('value');
+        return this.view.dataset.call_button(self.options.action, [this.view.datarecord.id, value, this.view.dataset.get_context()]).done(function(r) {
+            self.view.reload();
+        });
+    }
+});
 instance.web.form.FieldID = instance.web.form.FieldChar.extend({
     process_modifiers: function () {
         this._super();
@@ -5853,6 +5890,7 @@ instance.web.form.widgets = new instance.web.Registry({
     'monetary': 'instance.web.form.FieldMonetary',
     'many2many_checkboxes': 'instance.web.form.FieldMany2ManyCheckBoxes',
     'x2many_counter': 'instance.web.form.X2ManyCounter',
+    'stage_mode':'instance.web.form.StageMode'
 });
 
 /**
diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml
index ae7a4f279b0..8d1f9cb01f4 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -1031,6 +1031,31 @@
         </t>
     </span>
 </t>
+
+
+<t t-name="StageMode.kanban_state">
+    <div class="btn-group">
+    <t t-foreach="res" t-as="rec">
+            <a  class="dropdown-toggle" data-toggle="dropdown" href="#" t-if="widget.get('value') === rec.name"  t-att-title="rec.description" >
+                <t t-raw="rec.body" /> 
+            </a>
+    </t>
+    <ul class="dropdown-menu">
+        <t t-foreach="res" t-as="rec">
+            <t t-if="widget.get('value') !== rec.name">
+                <li><a  t-att-data-value="rec.name" href="#"><t t-raw="rec.body" /></a></li>
+            </t>
+        </t>
+    </ul>
+    </div>
+</t>
+<t t-name="StageMode.priority">
+    <t t-foreach="res" t-as="rec">
+            <a t-if="widget.get('value') === rec.name" t-att-data="rec.name"  t-att-title="rec.description" >
+                <t t-raw="rec.body" />
+            </a>
+    </t>
+</t>
 <t t-name="FieldEmail">
     <span class="oe_form_field oe_form_field_email" t-att-style="widget.node.attrs.style">
         <a t-if="widget.get('effective_readonly')" href="#" class="oe_form_uri" target="_blank"/>

From b5feff915301efaef7468d736af78f963f2d1f24 Mon Sep 17 00:00:00 2001
From: "RGA(OpenERP)" <>
Date: Tue, 17 Dec 2013 17:03:10 +0530
Subject: [PATCH 02/10] [IMP] template set priority

bzr revid: rgaopenerp-20131217113310-nkjo30xtdkebkj6q
---
 addons/web/static/src/xml/base.xml | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml
index 8d1f9cb01f4..c6a78ff7f0f 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -1050,11 +1050,18 @@
     </div>
 </t>
 <t t-name="StageMode.priority">
-    <t t-foreach="res" t-as="rec">
-            <a t-if="widget.get('value') === rec.name" t-att-data="rec.name"  t-att-title="rec.description" >
-                <t t-raw="rec.body" />
-            </a>
+    <ul style="list-style: none;">
+    <t t-foreach="res" t-as="test" >
+        <t t-if="widget.get('value') gte test.name and !test_first">
+            <li class="oe_left"><a  t-att-data-value="test.name - 1" href="#"><t t-raw="test.body"/></a></li>
+        </t>
     </t>
+    <t t-foreach="res" t-as="test" >
+        <t t-if="widget.get('value') lt test.name">
+            <li class="oe_left"><a  t-att-data-value="test.name" href="#"><t t-raw="res[0].body"/></a></li>
+        </t>
+    </t>
+    </ul>
 </t>
 <t t-name="FieldEmail">
     <span class="oe_form_field oe_form_field_email" t-att-style="widget.node.attrs.style">

From 752fa2e2a5b144cb9ce2e7217827c2432f385255 Mon Sep 17 00:00:00 2001
From: "Mahendra Barad (OpenERP)" <mba@tinyerp.com>
Date: Thu, 19 Dec 2013 14:08:51 +0530
Subject: [PATCH 03/10] [IMP]improved css as well as improved stagemode widget

bzr revid: mba@tinyerp.com-20131219083851-c2hp4dddtpfxm0l6
---
 addons/web/static/src/css/base.css        | 38 +++++++++++++++++++++--
 addons/web/static/src/css/base.sass       | 25 +++++++++++++++
 addons/web/static/src/js/view_form.js     |  5 +--
 addons/web/static/src/js/view_list.js     |  3 +-
 addons/web/static/src/xml/base.xml        |  6 ++--
 addons/web_kanban/static/src/js/kanban.js | 13 +++++---
 6 files changed, 76 insertions(+), 14 deletions(-)

diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css
index 010585ee4a0..e59be2e551e 100644
--- a/addons/web/static/src/css/base.css
+++ b/addons/web/static/src/css/base.css
@@ -1,4 +1,4 @@
-@charset "utf-8";
+@charset "UTF-8";
 @font-face {
   font-family: "mnmliconsRegular";
   src: url("/web/static/src/font/mnmliconsv21-webfont.eot") format("eot");
@@ -2290,7 +2290,7 @@
 }
 .openerp .oe_form .oe_form_label_help[for] span, .openerp .oe_form .oe_form_label[for] span {
   font-size: 80%;
-  color: darkGreen;
+  color: darkgreen;
   vertical-align: top;
   position: relative;
   top: -4px;
@@ -3434,7 +3434,6 @@ div.ui-widget-overlay {
     overflow: hidden !important;
   }
 }
-
 .nav li > a {
   padding: 3px 4px 2px 18px;
   color: #4c4c4c;
@@ -3569,6 +3568,39 @@ h5 {
   color: #eeeeee;
 }
 
+.dropdown-menu.with-arrow {
+  background: white;
+  background: white !important;
+}
+
+.dropdown-menu.with-arrow:before {
+  position: absolute;
+  top: -12px;
+  left: 9px;
+  display: inline-block;
+  border-right: 12px solid transparent;
+  border-bottom: 12px solid #cccccc;
+  border-left: 12px solid transparent;
+  border-bottom-color: rgba(0, 0, 0, 0.2);
+  content: "";
+}
+
+.dropdown-menu.with-arrow:after {
+  position: absolute;
+  top: -11px;
+  left: 10px;
+  display: inline-block;
+  border-right: 11px solid transparent;
+  border-bottom: 11px solid white;
+  border-left: 11px solid transparent;
+  content: "";
+}
+
+.dropdown-menu.with-arrow li a {
+  color: black;
+  font-weight: bold;
+}
+
 .ui-icon {
   width: 18px;
   height: 18px;
diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass
index e9a51370192..3f915de78d9 100644
--- a/addons/web/static/src/css/base.sass
+++ b/addons/web/static/src/css/base.sass
@@ -2843,6 +2843,31 @@ h5
     li
         a,a:hover,a:focus
             color: #eeeeee
+.dropdown-menu.with-arrow
+    background: #FFF
+    background: #FFF !important
+.dropdown-menu.with-arrow:before
+    position: absolute
+    top: -12px
+    left: 9px
+    display: inline-block
+    border-right: 12px solid transparent
+    border-bottom: 12px solid #ccc
+    border-left: 12px solid transparent
+    border-bottom-color: rgba(0, 0, 0, 0.2)
+    content: ''
+.dropdown-menu.with-arrow:after
+    position: absolute
+    top: -11px
+    left: 10px
+    display: inline-block
+    border-right: 11px solid transparent
+    border-bottom: 11px solid #ffffff
+    border-left: 11px solid transparent
+    content: ''
+.dropdown-menu.with-arrow li a
+    color: #000
+    font-weight: bold
 // End hack }}}
 
 // Hack for ui icon {{{
diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js
index d772cbb55cd..ceed2037813 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -2334,14 +2334,15 @@ instance.web.form.StageMode = instance.web.form.FieldChar.extend({
     init: function (field_manager, node) {
         this._super(field_manager, node);
         this.options = py.eval(node.attrs.options) 
-        this.stage_dataset  = new instance.web.DataSetStatic(this, this.options.stage_model, this.build_context());
+        this.stage_dataset  = new instance.web.DataSetStatic(this, 'ir.ui.legend', this.build_context());
         this.stage_field = this.options.stage_field;
     },
     
     get_stage_value: function(){
         var def = $.Deferred();
         var stage_id = this.field_manager.fields[this.stage_field].get_value()
-        this.stage_dataset.call('search_read', [[[this.stage_field,'=', stage_id],['type','=',this.name]]]).then(function (res){
+        var model = this.field_manager.fields[this.stage_field].field.relation
+        this.stage_dataset.call('search_read', [[['res_id','=', stage_id],['type','=',this.name],['res_model','=',model]]]).then(function (res){
                     def.resolve(res);
                 })
         return def
diff --git a/addons/web/static/src/js/view_list.js b/addons/web/static/src/js/view_list.js
index 17c62917a18..d11393825cf 100644
--- a/addons/web/static/src/js/view_list.js
+++ b/addons/web/static/src/js/view_list.js
@@ -1104,10 +1104,11 @@ instance.web.ListView.List = instance.web.Class.extend( /** @lends instance.web.
                 record.set(column.id, false);
             }
         }
-        return column.format(record.toForm().data, {
+         var value = column.format(record.toForm().data, {
             model: this.dataset.model,
             id: record.get('id')
         });
+         return _.unescape(value)
     },
     render: function () {
         this.$current.empty().append(
diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml
index c6a78ff7f0f..14122c5acf8 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -1040,17 +1040,17 @@
                 <t t-raw="rec.body" /> 
             </a>
     </t>
-    <ul class="dropdown-menu">
+    <ul class="dropdown-menu with-arrow">
         <t t-foreach="res" t-as="rec">
             <t t-if="widget.get('value') !== rec.name">
-                <li><a  t-att-data-value="rec.name" href="#"><t t-raw="rec.body" /></a></li>
+                <li><a  t-att-data-value="rec.name" href="#"><t t-raw="rec.body" /><t t-raw="rec.legend_name" /></a></li>
             </t>
         </t>
     </ul>
     </div>
 </t>
 <t t-name="StageMode.priority">
-    <ul style="list-style: none;">
+    <ul style="list-style: none; padding-left: 2px;">
     <t t-foreach="res" t-as="test" >
         <t t-if="widget.get('value') gte test.name and !test_first">
             <li class="oe_left"><a  t-att-data-value="test.name - 1" href="#"><t t-raw="test.body"/></a></li>
diff --git a/addons/web_kanban/static/src/js/kanban.js b/addons/web_kanban/static/src/js/kanban.js
index b14f60e15f8..4106ed21ffa 100644
--- a/addons/web_kanban/static/src/js/kanban.js
+++ b/addons/web_kanban/static/src/js/kanban.js
@@ -34,6 +34,7 @@ instance.web_kanban.KanbanView = instance.web.View.extend({
         };
         this.groups = [];
         this.aggregates = {};
+        this.legend = {};
         this.group_operators = ['avg', 'max', 'min', 'sum', 'count'];
         this.qweb = new QWeb2.Engine();
         this.qweb.debug = instance.session.debug;
@@ -624,7 +625,10 @@ instance.web_kanban.KanbanGroup = instance.web.Widget.extend({
         }
         this.$el.data('widget', this);
         this.$records.data('widget', this);
-        this.$has_been_started.resolve();
+        var def_tooltip = this.fetch_tooltip();
+        $.when(def_tooltip).done(function (){
+            self.$has_been_started.resolve();
+        });
         var add_btn = this.$el.find('.oe_kanban_add');
         add_btn.tipsy({delayIn: 500, delayOut: 1000});
         this.$records.find(".oe_kanban_column_cards").click(function (ev) {
@@ -635,8 +639,6 @@ instance.web_kanban.KanbanGroup = instance.web.Widget.extend({
             }
         });
         this.is_started = true;
-        var def_tooltip = this.fetch_tooltip();
-        return $.when(def_tooltip);
     },
     fetch_tooltip: function() {
         if (! this.group)
@@ -665,8 +667,9 @@ instance.web_kanban.KanbanGroup = instance.web.Widget.extend({
         if (this.value) {
             return (new instance.web.Model(field.relation)).query([options.tooltip_on_group_by])
                     .filter([["id", "=", this.value]]).first().then(function(res) {
-                self.tooltip = res[options.tooltip_on_group_by];
-                self.$(".oe_kanban_group_title_text").attr("title", self.tooltip || self.title || "").tipsy({html: true});
+                    self.legend = res[options.tooltip_on_group_by];
+                    var title = self.legend.tooltip || self.legend || self.title || ""
+                    self.$(".oe_kanban_group_title_text").attr("title", title).tipsy({html: true,className: 'oe_tooltip_kanban_message'});
             });
         }
     },

From fdcb64ef8c4bf9775bc38e133ccd923342fd7fa7 Mon Sep 17 00:00:00 2001
From: "Mahendra Barad (OpenERP)" <mba@tinyerp.com>
Date: Fri, 20 Dec 2013 14:18:46 +0530
Subject: [PATCH 04/10] [IMP]improve the legend widget

bzr revid: mba@tinyerp.com-20131220084846-875n332j1m1igip7
---
 addons/web/static/src/css/base.css    |  5 +++--
 addons/web/static/src/css/base.sass   |  3 ++-
 addons/web/static/src/js/view_form.js | 32 +++++++++------------------
 addons/web/static/src/xml/base.xml    | 24 ++++++++++----------
 4 files changed, 27 insertions(+), 37 deletions(-)

diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css
index e59be2e551e..c40bb16cdf1 100644
--- a/addons/web/static/src/css/base.css
+++ b/addons/web/static/src/css/base.css
@@ -3598,9 +3598,10 @@ h5 {
 
 .dropdown-menu.with-arrow li a {
   color: black;
-  font-weight: bold;
 }
-
+.dropdown-menu.with-arrow li a, .dropdown-menu.with-arrow li a:hover, .dropdown-menu.with-arrow li a:focus {
+  text-decoration: none;
+}
 .ui-icon {
   width: 18px;
   height: 18px;
diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass
index 3f915de78d9..c36cc2b8eb2 100644
--- a/addons/web/static/src/css/base.sass
+++ b/addons/web/static/src/css/base.sass
@@ -2867,7 +2867,8 @@ h5
     content: ''
 .dropdown-menu.with-arrow li a
     color: #000
-    font-weight: bold
+.dropdown-menu.with-arrow li a, .dropdown-menu.with-arrow li a:hover, .dropdown-menu.with-arrow li a:focus
+  text-decoration: none;
 // End hack }}}
 
 // Hack for ui icon {{{
diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js
index ceed2037813..0d3a38b5c17 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -2330,34 +2330,22 @@ instance.web.form.FieldChar = instance.web.form.AbstractField.extend(instance.we
         });
     }
 });
-instance.web.form.StageMode = instance.web.form.FieldChar.extend({
+instance.web.form.Legend = instance.web.form.FieldChar.extend({
     init: function (field_manager, node) {
         this._super(field_manager, node);
         this.options = py.eval(node.attrs.options) 
-        this.stage_dataset  = new instance.web.DataSetStatic(this, 'ir.ui.legend', this.build_context());
-        this.stage_field = this.options.stage_field;
-    },
-    
-    get_stage_value: function(){
-        var def = $.Deferred();
-        var stage_id = this.field_manager.fields[this.stage_field].get_value()
-        var model = this.field_manager.fields[this.stage_field].field.relation
-        this.stage_dataset.call('search_read', [[['res_id','=', stage_id],['type','=',this.name],['res_model','=',model]]]).then(function (res){
-                    def.resolve(res);
-                })
-        return def
+        this.legend_field = this.options.legend_field;
     },
     
     render_value: function() {
         var self = this;
-        self.get_stage_value().then(function (res){
-            var content = QWeb.render("StageMode."+self.name, {
-                'widget': self, 
-                'res': res,
-                });
-            self.$el.html(content);
-            self.$el.find("li").click(self.execute_action.bind(self));
-        })
+        var legend_value = this.field_manager.fields[this.legend_field].get_value()
+        var content = QWeb.render("Legend."+ self.name, {
+            'widget': self, 
+            'legend_value': legend_value,
+            });
+        self.$el.html(content);
+        self.$el.find("li").click(self.execute_action.bind(self));
     },
     execute_action: function(e){
         e.preventDefault();
@@ -5891,7 +5879,7 @@ instance.web.form.widgets = new instance.web.Registry({
     'monetary': 'instance.web.form.FieldMonetary',
     'many2many_checkboxes': 'instance.web.form.FieldMany2ManyCheckBoxes',
     'x2many_counter': 'instance.web.form.X2ManyCounter',
-    'stage_mode':'instance.web.form.StageMode'
+    'legend':'instance.web.form.Legend'
 });
 
 /**
diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml
index 14122c5acf8..bf185cd6df0 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -1033,32 +1033,32 @@
 </t>
 
 
-<t t-name="StageMode.kanban_state">
+<t t-name="Legend.kanban_state_legend">
     <div class="btn-group">
-    <t t-foreach="res" t-as="rec">
-            <a  class="dropdown-toggle" data-toggle="dropdown" href="#" t-if="widget.get('value') === rec.name"  t-att-title="rec.description" >
+    <t t-foreach="widget.get('value')" t-as="rec">
+            <a  class="dropdown-toggle" data-toggle="dropdown" href="#" t-if="legend_value === rec.name"  t-att-title="rec.description" >
                 <t t-raw="rec.body" /> 
             </a>
     </t>
     <ul class="dropdown-menu with-arrow">
-        <t t-foreach="res" t-as="rec">
-            <t t-if="widget.get('value') !== rec.name">
+        <t t-foreach="widget.get('value')" t-as="rec">
+            <t t-if="legend_value !== rec.name">
                 <li><a  t-att-data-value="rec.name" href="#"><t t-raw="rec.body" /><t t-raw="rec.legend_name" /></a></li>
             </t>
         </t>
     </ul>
     </div>
 </t>
-<t t-name="StageMode.priority">
-    <ul style="list-style: none; padding-left: 2px;">
-    <t t-foreach="res" t-as="test" >
-        <t t-if="widget.get('value') gte test.name and !test_first">
+<t t-name="Legend.priority_legend">
+    <ul style="list-style: none; padding-left: 5px;">
+    <t t-foreach="widget.get('value')" t-as="test" >
+        <t t-if="legend_value gte test.name and !test_first">
             <li class="oe_left"><a  t-att-data-value="test.name - 1" href="#"><t t-raw="test.body"/></a></li>
         </t>
     </t>
-    <t t-foreach="res" t-as="test" >
-        <t t-if="widget.get('value') lt test.name">
-            <li class="oe_left"><a  t-att-data-value="test.name" href="#"><t t-raw="res[0].body"/></a></li>
+    <t t-foreach="widget.get('value')" t-as="test" >
+        <t t-if="legend_value lt test.name">
+            <li class="oe_left"><a  t-att-data-value="test.name" href="#"><t t-raw="widget.get('value')[0].body"/></a></li>
         </t>
     </t>
     </ul>

From 53a1a4f1fbbcc3d11f1e973333a8073b526b748e Mon Sep 17 00:00:00 2001
From: "Mahendra Barad (OpenERP)" <mba@tinyerp.com>
Date: Fri, 20 Dec 2013 14:58:40 +0530
Subject: [PATCH 05/10] [IMP]improved css

bzr revid: mba@tinyerp.com-20131220092840-933qq22q1v9287mn
---
 addons/web/static/src/css/base.css  | 4 ++--
 addons/web/static/src/css/base.sass | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css
index c40bb16cdf1..c4f0f91adcd 100644
--- a/addons/web/static/src/css/base.css
+++ b/addons/web/static/src/css/base.css
@@ -3576,7 +3576,7 @@ h5 {
 .dropdown-menu.with-arrow:before {
   position: absolute;
   top: -12px;
-  left: 9px;
+  left: 0px;
   display: inline-block;
   border-right: 12px solid transparent;
   border-bottom: 12px solid #cccccc;
@@ -3588,7 +3588,7 @@ h5 {
 .dropdown-menu.with-arrow:after {
   position: absolute;
   top: -11px;
-  left: 10px;
+  left: 1px;
   display: inline-block;
   border-right: 11px solid transparent;
   border-bottom: 11px solid white;
diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass
index c36cc2b8eb2..078fb28e137 100644
--- a/addons/web/static/src/css/base.sass
+++ b/addons/web/static/src/css/base.sass
@@ -2849,7 +2849,7 @@ h5
 .dropdown-menu.with-arrow:before
     position: absolute
     top: -12px
-    left: 9px
+    left: 0px
     display: inline-block
     border-right: 12px solid transparent
     border-bottom: 12px solid #ccc
@@ -2859,7 +2859,7 @@ h5
 .dropdown-menu.with-arrow:after
     position: absolute
     top: -11px
-    left: 10px
+    left: 1px
     display: inline-block
     border-right: 11px solid transparent
     border-bottom: 11px solid #ffffff

From ab6f79e75914636b7921afeeb8fa48e31aa92383 Mon Sep 17 00:00:00 2001
From: "RGA(OpenERP)" <>
Date: Fri, 20 Dec 2013 15:49:40 +0530
Subject: [PATCH 06/10] [IMP] legend widget

bzr revid: rgaopenerp-20131220101940-90ialtu8fqcdborg
---
 addons/web/static/src/js/view_form.js     | 17 ++++++------
 addons/web/static/src/xml/base.xml        |  6 ++---
 addons/web_kanban/static/src/js/kanban.js | 32 +++++++++++++++++++++++
 3 files changed, 44 insertions(+), 11 deletions(-)

diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js
index 0d3a38b5c17..d31f8ff2145 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -2344,17 +2344,18 @@ instance.web.form.Legend = instance.web.form.FieldChar.extend({
             'widget': self, 
             'legend_value': legend_value,
             });
-        self.$el.html(content);
-        self.$el.find("li").click(self.execute_action.bind(self));
+        this.$el.html(content);
+        this.$el.find('li').click(self.execute_action.bind(self));
     },
     execute_action: function(e){
-        e.preventDefault();
         var self = this;
-        $this = $(e.target)
-        var value = $this.data('value') || $this.parent().data('value');
-        return this.view.dataset.call_button(self.options.action, [this.view.datarecord.id, value, this.view.dataset.get_context()]).done(function(r) {
-            self.view.reload();
-        });
+        var li = $(e.target).closest( "li" );
+        if (li.length){
+            var value = li.data('value');
+            return this.view.dataset.call_button(self.options.action, [this.view.datarecord.id, value, this.view.dataset.get_context()]).done(function(r) {
+                self.view.reload();
+            });
+        }
     }
 });
 instance.web.form.FieldID = instance.web.form.FieldChar.extend({
diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml
index bf185cd6df0..12b247534a8 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -1043,7 +1043,7 @@
     <ul class="dropdown-menu with-arrow">
         <t t-foreach="widget.get('value')" t-as="rec">
             <t t-if="legend_value !== rec.name">
-                <li><a  t-att-data-value="rec.name" href="#"><t t-raw="rec.body" /><t t-raw="rec.legend_name" /></a></li>
+                <li t-att-data-value="rec.name"><a href="#"><t t-raw="rec.body" /><t t-raw="rec.legend_name" /></a></li>
             </t>
         </t>
     </ul>
@@ -1053,12 +1053,12 @@
     <ul style="list-style: none; padding-left: 5px;">
     <t t-foreach="widget.get('value')" t-as="test" >
         <t t-if="legend_value gte test.name and !test_first">
-            <li class="oe_left"><a  t-att-data-value="test.name - 1" href="#"><t t-raw="test.body"/></a></li>
+            <li  t-att-data-value="test.name - 1"  class="oe_left"><a href="#"><t t-raw="test.body"/></a></li>
         </t>
     </t>
     <t t-foreach="widget.get('value')" t-as="test" >
         <t t-if="legend_value lt test.name">
-            <li class="oe_left"><a  t-att-data-value="test.name" href="#"><t t-raw="widget.get('value')[0].body"/></a></li>
+            <li  t-att-data-value="test.name" class="oe_left"><a  href="#"><t t-raw="widget.get('value')[0].body"/></a></li>
         </t>
     </t>
     </ul>
diff --git a/addons/web_kanban/static/src/js/kanban.js b/addons/web_kanban/static/src/js/kanban.js
index 4106ed21ffa..ec5c8cce204 100644
--- a/addons/web_kanban/static/src/js/kanban.js
+++ b/addons/web_kanban/static/src/js/kanban.js
@@ -1230,7 +1230,39 @@ instance.web_kanban.AbstractField = instance.web.Widget.extend(instance.web_kanb
     },
 });
 
+instance.web_kanban.Legend = instance.web_kanban.AbstractField.extend({
+    init: function(parent, field, $node) {
+        this._super.apply(this, arguments);
+        this.parent = parent;
+        this.name = $node.attr('name')
+    },
+    renderElement: function() {
+        var self = this;
+        var legend_field = this.options.legend_field;
+        var legend_field_value = this.parent.record[legend_field].raw_value 
+        var content = QWeb.render("Legend." + self.name, {
+            'widget': self, 
+            'legend_value':  legend_field_value,
+            });
+        this.$el.html(content);
+        this.$el.click(self.execute_action.bind(self));
+    },
+    execute_action: function(e){
+        e.preventDefault();
+        var li = $(e.target).closest( "li" );
+        if (li.length){
+            var parent = this.parent
+            var value = li.data('value');
+            return parent.view.dataset.call_button(this.options.action, [parent.id, value, parent.view.dataset.get_context()]).done(function(r) {
+                parent.do_reload();
+            });
+        }
+    } 
+});
+
+
 instance.web_kanban.fields_registry = new instance.web.Registry({});
+instance.web_kanban.fields_registry.add('legend','instance.web_kanban.Legend');
 };
 
 // vim:et fdc=0 fdl=0 foldnestmax=3 fdm=syntax:

From 6ad2ea0202360fefa68fa36740379cec0926a266 Mon Sep 17 00:00:00 2001
From: "RGA(OpenERP)" <>
Date: Fri, 20 Dec 2013 17:40:19 +0530
Subject: [PATCH 07/10] [IMP] legend widget

bzr revid: rgaopenerp-20131220121019-h1o0lllprbo02uqa
---
 addons/web/static/src/js/view_form.js     | 53 +++++++++++++++--------
 addons/web/static/src/xml/base.xml        |  8 ++--
 addons/web_kanban/static/src/js/kanban.js | 23 +++-------
 3 files changed, 47 insertions(+), 37 deletions(-)

diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js
index d31f8ff2145..a967a9c9d66 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -2330,34 +2330,53 @@ instance.web.form.FieldChar = instance.web.form.AbstractField.extend(instance.we
         });
     }
 });
-instance.web.form.Legend = instance.web.form.FieldChar.extend({
-    init: function (field_manager, node) {
-        this._super(field_manager, node);
-        this.options = py.eval(node.attrs.options) 
-        this.legend_field = this.options.legend_field;
+
+instance.web.Legend = instance.web.Widget.extend({
+    init: function (parent, dataset, options) {
+        this._super(parent);
+        this.parent = parent;
+        this.dataset = dataset;
+        this.options = options; 
     },
     
-    render_value: function() {
+    render_value: function(record_id, data) {
         var self = this;
-        var legend_value = this.field_manager.fields[this.legend_field].get_value()
-        var content = QWeb.render("Legend."+ self.name, {
-            'widget': self, 
-            'legend_value': legend_value,
-            });
-        this.$el.html(content);
-        this.$el.find('li').click(self.execute_action.bind(self));
+        self.record_id = record_id;
+        var content = QWeb.render("Legend."+ self.parent.name, data);
+        this.parent.$el.html(content);
+        if (!this.parent.get("effective_readonly")){
+            this.parent.$el.find('.oe_legend').click(self.do_action.bind(self));
+        }
     },
-    execute_action: function(e){
+    do_action: function(e){
         var self = this;
         var li = $(e.target).closest( "li" );
         if (li.length){
             var value = li.data('value');
-            return this.view.dataset.call_button(self.options.action, [this.view.datarecord.id, value, this.view.dataset.get_context()]).done(function(r) {
-                self.view.reload();
-            });
+            return self.dataset.call_button(self.options.action, [self.record_id, value, self.dataset.get_context()]).done(self.parent.reload_record.bind(self.parent));
         }
     }
 });
+
+instance.web.form.Legend = instance.web.form.FieldChar.extend({
+    init: function (field_manager, node) {
+        this._super(field_manager, node);
+        this.legend = new instance.web.Legend(this, this.view.dataset, py.eval(node.attrs.options));
+    },
+    
+    reload_record: function(){
+        this.view.reload();
+    },
+    render_value: function() {
+        var self = this;
+        var legend_field = this.options.legend_field;
+        var legend_value = this.field_manager.fields[legend_field].get_value();
+        self.legend.render_value(this.view.datarecord.id, {
+            'widget': self, 
+            'legend_value': legend_value,
+            });
+    },
+});
 instance.web.form.FieldID = instance.web.form.FieldChar.extend({
     process_modifiers: function () {
         this._super();
diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml
index 12b247534a8..5dc8d210a32 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -1036,14 +1036,14 @@
 <t t-name="Legend.kanban_state_legend">
     <div class="btn-group">
     <t t-foreach="widget.get('value')" t-as="rec">
-            <a  class="dropdown-toggle" data-toggle="dropdown" href="#" t-if="legend_value === rec.name"  t-att-title="rec.description" >
+            <a  class="dropdown-toggle oe_legend" data-toggle="dropdown" href="#" t-if="legend_value === rec.name"  t-att-title="rec.description" >
                 <t t-raw="rec.body" /> 
             </a>
     </t>
     <ul class="dropdown-menu with-arrow">
         <t t-foreach="widget.get('value')" t-as="rec">
             <t t-if="legend_value !== rec.name">
-                <li t-att-data-value="rec.name"><a href="#"><t t-raw="rec.body" /><t t-raw="rec.legend_name" /></a></li>
+                <li class="oe_legend" t-att-data-value="rec.name"><a href="#"><t t-raw="rec.body" /><t t-raw="rec.legend_name" /></a></li>
             </t>
         </t>
     </ul>
@@ -1053,12 +1053,12 @@
     <ul style="list-style: none; padding-left: 5px;">
     <t t-foreach="widget.get('value')" t-as="test" >
         <t t-if="legend_value gte test.name and !test_first">
-            <li  t-att-data-value="test.name - 1"  class="oe_left"><a href="#"><t t-raw="test.body"/></a></li>
+            <li t-att-data-value="test.name - 1"  class="oe_left oe_legend"><a href="#"><t t-raw="test.body"/></a></li>
         </t>
     </t>
     <t t-foreach="widget.get('value')" t-as="test" >
         <t t-if="legend_value lt test.name">
-            <li  t-att-data-value="test.name" class="oe_left"><a  href="#"><t t-raw="widget.get('value')[0].body"/></a></li>
+            <li t-att-data-value="test.name" class="oe_left oe_legend"><a  href="#"><t t-raw="widget.get('value')[0].body"/></a></li>
         </t>
     </t>
     </ul>
diff --git a/addons/web_kanban/static/src/js/kanban.js b/addons/web_kanban/static/src/js/kanban.js
index ec5c8cce204..888397c90ac 100644
--- a/addons/web_kanban/static/src/js/kanban.js
+++ b/addons/web_kanban/static/src/js/kanban.js
@@ -1233,31 +1233,22 @@ instance.web_kanban.AbstractField = instance.web.Widget.extend(instance.web_kanb
 instance.web_kanban.Legend = instance.web_kanban.AbstractField.extend({
     init: function(parent, field, $node) {
         this._super.apply(this, arguments);
-        this.parent = parent;
         this.name = $node.attr('name')
+        this.parent = parent;
+        this.legend = new instance.web.Legend(this, parent.view.dataset, this.options);
+    },
+    reload_record: function(){
+        this.parent.do_reload();
     },
     renderElement: function() {
         var self = this;
         var legend_field = this.options.legend_field;
-        var legend_field_value = this.parent.record[legend_field].raw_value 
-        var content = QWeb.render("Legend." + self.name, {
+        var legend_field_value = this.parent.record[legend_field].raw_value
+        self.legend.render_value(this.parent.id, {
             'widget': self, 
             'legend_value':  legend_field_value,
             });
-        this.$el.html(content);
-        this.$el.click(self.execute_action.bind(self));
     },
-    execute_action: function(e){
-        e.preventDefault();
-        var li = $(e.target).closest( "li" );
-        if (li.length){
-            var parent = this.parent
-            var value = li.data('value');
-            return parent.view.dataset.call_button(this.options.action, [parent.id, value, parent.view.dataset.get_context()]).done(function(r) {
-                parent.do_reload();
-            });
-        }
-    } 
 });
 
 

From 805fef4f478082c3f4c733648c7c534c57dbadd5 Mon Sep 17 00:00:00 2001
From: "RGA(OpenERP)" <>
Date: Fri, 20 Dec 2013 19:38:24 +0530
Subject: [PATCH 08/10] [IMP] legend widget

bzr revid: rgaopenerp-20131220140824-2zr27ool75k60u1w
---
 addons/web/static/src/js/view_form.js | 6 +++++-
 addons/web/static/src/xml/base.xml    | 4 ++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js
index a967a9c9d66..ede4d7a0c5d 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -2343,7 +2343,10 @@ instance.web.Legend = instance.web.Widget.extend({
         var self = this;
         self.record_id = record_id;
         var content = QWeb.render("Legend."+ self.parent.name, data);
-        this.parent.$el.html(content);
+        if (data.view_mode === 'form')
+            this.parent.$el.html(content);
+        else
+            this.parent.$el = $(content);
         if (!this.parent.get("effective_readonly")){
             this.parent.$el.find('.oe_legend').click(self.do_action.bind(self));
         }
@@ -2374,6 +2377,7 @@ instance.web.form.Legend = instance.web.form.FieldChar.extend({
         self.legend.render_value(this.view.datarecord.id, {
             'widget': self, 
             'legend_value': legend_value,
+            'view_mode':'form'
             });
     },
 });
diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml
index 5dc8d210a32..cd7005c7bfd 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -1034,7 +1034,7 @@
 
 
 <t t-name="Legend.kanban_state_legend">
-    <div class="btn-group">
+    <span class="btn-group">
     <t t-foreach="widget.get('value')" t-as="rec">
             <a  class="dropdown-toggle oe_legend" data-toggle="dropdown" href="#" t-if="legend_value === rec.name"  t-att-title="rec.description" >
                 <t t-raw="rec.body" /> 
@@ -1047,7 +1047,7 @@
             </t>
         </t>
     </ul>
-    </div>
+    </span>
 </t>
 <t t-name="Legend.priority_legend">
     <ul style="list-style: none; padding-left: 5px;">

From 54346578c86a10d14497f18e8b3aafc930eb6a2b Mon Sep 17 00:00:00 2001
From: "Mahendra Barad (OpenERP)" <mba@tinyerp.com>
Date: Thu, 26 Dec 2013 15:07:22 +0530
Subject: [PATCH 09/10] [IMP]improved title for tooltip

bzr revid: mba@tinyerp.com-20131226093722-mbv3s7jxjz5s1sjg
---
 addons/web/static/src/xml/base.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml
index cd7005c7bfd..f3eba6dde09 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -1036,7 +1036,7 @@
 <t t-name="Legend.kanban_state_legend">
     <span class="btn-group">
     <t t-foreach="widget.get('value')" t-as="rec">
-            <a  class="dropdown-toggle oe_legend" data-toggle="dropdown" href="#" t-if="legend_value === rec.name"  t-att-title="rec.description" >
+            <a  class="dropdown-toggle oe_legend" data-toggle="dropdown" href="#" t-if="legend_value === rec.name"  t-att-title="rec.description or rec.legend_name" >
                 <t t-raw="rec.body" /> 
             </a>
     </t>
@@ -1053,12 +1053,12 @@
     <ul style="list-style: none; padding-left: 5px;">
     <t t-foreach="widget.get('value')" t-as="test" >
         <t t-if="legend_value gte test.name and !test_first">
-            <li t-att-data-value="test.name - 1"  class="oe_left oe_legend"><a href="#"><t t-raw="test.body"/></a></li>
+            <li t-att-data-value="test.name - 1"  class="oe_left oe_legend"><a href="#" t-att-title="test.description or test.legend_name"><t t-raw="test.body"/></a></li>
         </t>
     </t>
     <t t-foreach="widget.get('value')" t-as="test" >
         <t t-if="legend_value lt test.name">
-            <li t-att-data-value="test.name" class="oe_left oe_legend"><a  href="#"><t t-raw="widget.get('value')[0].body"/></a></li>
+            <li t-att-data-value="test.name" class="oe_left oe_legend"><a  href="#" t-att-title="widget.get('value')[0].description or widget.get('value')[0].legend_name"><t t-raw="widget.get('value')[0].body"/></a></li>
         </t>
     </t>
     </ul>

From d7e09b669c9118021020ff0e3da6ba041ec9c5c8 Mon Sep 17 00:00:00 2001
From: "Mahendra Barad (OpenERP)" <mba@tinyerp.com>
Date: Tue, 7 Jan 2014 18:28:32 +0530
Subject: [PATCH 10/10] [IMP]

bzr revid: mba@tinyerp.com-20140107125832-fzt8cceyj3et7hgy
---
 addons/web/static/src/js/view_form.js     | 41 +++++++++++++++++----
 addons/web/static/src/xml/base.xml        | 43 +++++++++++------------
 addons/web_kanban/static/src/js/kanban.js |  7 ++--
 3 files changed, 57 insertions(+), 34 deletions(-)

diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js
index ede4d7a0c5d..901a4bdcb72 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -2338,11 +2338,42 @@ instance.web.Legend = instance.web.Widget.extend({
         this.dataset = dataset;
         this.options = options; 
     },
-    
+    prepare_data: function() {
+    	var self =this;
+        var def = $.Deferred();
+        if (this.parent.name == 'kanban_state'){
+            var datas = [{ 'name': 'normal', 'legend_name': ' Normal', 'legend': '<img src="/web/static/src/img/icons/gtk-normal.png"/>' },
+                         { 'name': 'blocked', 'legend_name': ' Blocked', 'legend': '<img src="/web/static/src/img/icons/gtk-no.png"/>' },
+                         { 'name': 'done', 'legend_name': ' Done', 'legend': '<img src="/web/static/src/img/icons/gtk-yes.png"/>' }]
+            return  def.resolve(datas);
+        }
+        if (this.parent.name == 'priority'){
+            var data = [];
+            var selection = this.parent.field.selection || [];
+            for (var index in selection) {
+                value = {
+                    'name': selection[index][0],
+                    'legend_name': selection[index][1]
+                }
+                if (selection[index][0] == '0'){
+                    value['legend']= '<img src="/web/static/src/img/icons/star-off.png"/>';
+                    value['legend_name'] = 'Set the Priority';
+                }else{
+                    value['legend']= '<img src="/web/static/src/img/icons/star-on.png"/>';
+                }
+                data.push(value)
+            }
+            return  def.resolve(data);
+        }
+    },
     render_value: function(record_id, data) {
         var self = this;
+        var content;
         self.record_id = record_id;
-        var content = QWeb.render("Legend."+ self.parent.name, data);
+        this.prepare_data().then(function (res){
+            data['res'] = res;
+            content = QWeb.render("Legend."+ self.parent.name, data);
+        });
         if (data.view_mode === 'form')
             this.parent.$el.html(content);
         else
@@ -2366,19 +2397,15 @@ instance.web.form.Legend = instance.web.form.FieldChar.extend({
         this._super(field_manager, node);
         this.legend = new instance.web.Legend(this, this.view.dataset, py.eval(node.attrs.options));
     },
-    
     reload_record: function(){
         this.view.reload();
     },
     render_value: function() {
         var self = this;
-        var legend_field = this.options.legend_field;
-        var legend_value = this.field_manager.fields[legend_field].get_value();
         self.legend.render_value(this.view.datarecord.id, {
             'widget': self, 
-            'legend_value': legend_value,
             'view_mode':'form'
-            });
+        });
     },
 });
 instance.web.form.FieldID = instance.web.form.FieldChar.extend({
diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml
index f3eba6dde09..6fca2d3260e 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -1032,35 +1032,34 @@
     </span>
 </t>
 
-
-<t t-name="Legend.kanban_state_legend">
+<t t-name="Legend.kanban_state">
     <span class="btn-group">
-    <t t-foreach="widget.get('value')" t-as="rec">
-            <a  class="dropdown-toggle oe_legend" data-toggle="dropdown" href="#" t-if="legend_value === rec.name"  t-att-title="rec.description or rec.legend_name" >
-                <t t-raw="rec.body" /> 
+        <t t-foreach="res" t-as="rec">
+            <a  class="dropdown-toggle oe_legend" data-toggle="dropdown" href="#" t-if="widget.get('value') === rec.name"  t-att-title="rec.legend_name" >
+                <t t-raw="rec.legend" /> 
             </a>
-    </t>
-    <ul class="dropdown-menu with-arrow">
-        <t t-foreach="widget.get('value')" t-as="rec">
-            <t t-if="legend_value !== rec.name">
-                <li class="oe_legend" t-att-data-value="rec.name"><a href="#"><t t-raw="rec.body" /><t t-raw="rec.legend_name" /></a></li>
-            </t>
         </t>
-    </ul>
+        <ul class="dropdown-menu with-arrow">
+            <t t-foreach="res" t-as="rec">
+                <t t-if="widget.get('value') !== rec.name">
+                    <li class="oe_legend" t-att-data-value="rec.name" ><a href="#"><t t-raw="rec.legend" /><t t-raw="rec.legend_name" /></a></li>
+                </t>
+            </t>
+        </ul>
     </span>
 </t>
-<t t-name="Legend.priority_legend">
-    <ul style="list-style: none; padding-left: 5px;">
-    <t t-foreach="widget.get('value')" t-as="test" >
-        <t t-if="legend_value gte test.name and !test_first">
-            <li t-att-data-value="test.name - 1"  class="oe_left oe_legend"><a href="#" t-att-title="test.description or test.legend_name"><t t-raw="test.body"/></a></li>
+<t t-name="Legend.priority">
+    <ul style="list-style: none; padding-left: 2px;">
+        <t t-foreach="res" t-as="test" >
+            <t t-if="widget.get('value') gte test.name and !test_first">
+                <li t-att-data-value="test.name - 1" class="oe_left oe_legend"><a href="#" t-att-title="test.legend_name"><t t-raw="test.legend"/></a></li>
+            </t>
         </t>
-    </t>
-    <t t-foreach="widget.get('value')" t-as="test" >
-        <t t-if="legend_value lt test.name">
-            <li t-att-data-value="test.name" class="oe_left oe_legend"><a  href="#" t-att-title="widget.get('value')[0].description or widget.get('value')[0].legend_name"><t t-raw="widget.get('value')[0].body"/></a></li>
+        <t t-foreach="res" t-as="test" >
+            <t t-if="widget.get('value') lt test.name">
+                <li t-att-data-value="test.name" class="oe_left oe_legend"><a href="#" t-att-title="res[0].legend_name"><t t-raw="res[0].legend"/></a></li>
+            </t>
         </t>
-    </t>
     </ul>
 </t>
 <t t-name="FieldEmail">
diff --git a/addons/web_kanban/static/src/js/kanban.js b/addons/web_kanban/static/src/js/kanban.js
index 888397c90ac..8c9b3fab930 100644
--- a/addons/web_kanban/static/src/js/kanban.js
+++ b/addons/web_kanban/static/src/js/kanban.js
@@ -1242,12 +1242,9 @@ instance.web_kanban.Legend = instance.web_kanban.AbstractField.extend({
     },
     renderElement: function() {
         var self = this;
-        var legend_field = this.options.legend_field;
-        var legend_field_value = this.parent.record[legend_field].raw_value
-        self.legend.render_value(this.parent.id, {
+        self.legend.render_value(self.parent.id, {
             'widget': self, 
-            'legend_value':  legend_field_value,
-            });
+        });
     },
 });