summaryrefslogtreecommitdiff
path: root/addons
diff options
context:
space:
mode:
authorThibault Delavallée <tde@openerp.com>2015-02-26 10:47:47 +0100
committerThibault Delavallée <tde@openerp.com>2015-02-26 10:47:47 +0100
commite332b2bb202ddfbc7427c54dd369ec12bbbfc2e2 (patch)
tree95926c5849aad3ad1b5e327799ebd2439aec1642 /addons
parent6d9e0c071c087849b5067adab67406bfb0cf04ba (diff)
[FIX] view_form, web_kanban: KanbanSelection widget in form and kanban: tooltip
now takes the stage custom tooltip if present, like the selection value, instead of the default one.
Diffstat (limited to 'addons')
-rw-r--r--addons/web/static/src/js/view_form.js1
-rw-r--r--addons/web_kanban/static/src/js/kanban.js1
2 files changed, 2 insertions, 0 deletions
diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js
index b47a5b2c929..bed0cefbd9e 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -2427,6 +2427,7 @@ instance.web.form.KanbanSelection = instance.web.form.FieldChar.extend({
}
if (stage_data && stage_data[0][self.options.states_legend[res[0]]]) {
value['state_name'] = stage_data[0][self.options.states_legend[res[0]]];
+ value['tooltip'] = stage_data[0][self.options.states_legend[res[0]]];
}
if (res[0] == 'normal') { value['state_class'] = 'oe_kanban_status'; }
else if (res[0] == 'done') { value['state_class'] = 'oe_kanban_status oe_kanban_status_green'; }
diff --git a/addons/web_kanban/static/src/js/kanban.js b/addons/web_kanban/static/src/js/kanban.js
index d2bbb9045de..6b8843bd0f7 100644
--- a/addons/web_kanban/static/src/js/kanban.js
+++ b/addons/web_kanban/static/src/js/kanban.js
@@ -1367,6 +1367,7 @@ instance.web_kanban.KanbanSelection = instance.web_kanban.AbstractField.extend({
var leg_opt = self.options && self.options.states_legend || null;
if (leg_opt && leg_opt[res[0]] && self.parent.group.values && self.parent.group.values[leg_opt[res[0]]]) {
value['state_name'] = self.parent.group.values[leg_opt[res[0]]];
+ value['tooltip'] = self.parent.group.values[leg_opt[res[0]]];
}
if (res[0] == 'normal') { value['state_class'] = 'oe_kanban_status'; }
else if (res[0] == 'done') { value['state_class'] = 'oe_kanban_status oe_kanban_status_green'; }