summaryrefslogtreecommitdiff
path: root/addons
diff options
context:
space:
mode:
authorqsm-odoo <qsm@odoo.com>2015-09-15 11:44:41 +0200
committerqsm-odoo <qsm@odoo.com>2015-09-15 13:17:43 +0200
commite29745cc4731b235f112f5fa08563b07cd0a3164 (patch)
tree213d9e684d6f4e34d487ccea01bcaf265846c9c7 /addons
parentf22686fb4d1a20b59ef1d699bac81868944eee4a (diff)
[FIX] web,project: kanban_selection widget position
Move the project kanban_selection widget out of h1 and make it as direct child of form sheet. This allows to put it on the right of oe_title no matter what (+ enterprise compatibility).
Diffstat (limited to 'addons')
-rw-r--r--addons/project/project_view.xml9
-rw-r--r--addons/web/static/src/js/views/form_widgets.js2
2 files changed, 6 insertions, 5 deletions
diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index 66253052f80..a294937293d 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -254,14 +254,15 @@
options='{"terminology": "archive"}'/>
</button>
</div>
+ <field name="kanban_state" widget="kanban_state_selection"
+ options='{
+ "states_legend_field": "stage_id",
+ "states_legend": {"normal": "legend_normal", "blocked": "legend_blocked", "done": "legend_done"}
+ }'/>
<div class="oe_title">
<h1 class="o_row">
<field name="priority" widget="priority"/>
<field name="name" placeholder="Task Title..."/>
- <field name="kanban_state" widget="kanban_state_selection"
- options='{
- "states_legend_field": "stage_id",
- "states_legend": {"normal": "legend_normal", "blocked": "legend_blocked", "done": "legend_done"}}'/>
</h1>
</div>
<group>
diff --git a/addons/web/static/src/js/views/form_widgets.js b/addons/web/static/src/js/views/form_widgets.js
index a7f6a9f050a..5e92ca2e116 100644
--- a/addons/web/static/src/js/views/form_widgets.js
+++ b/addons/web/static/src/js/views/form_widgets.js
@@ -218,7 +218,7 @@ var KanbanSelection = FieldChar.extend({
var dd_fetched = this.prepare_dropdown_selection();
return $.when(dd_fetched).then(function (states) {
self.states = states;
- self.$el.addClass('oe_right');
+ self.$el.addClass('oe_right oe_inline');
self.$el.html(QWeb.render("KanbanSelection", {'widget': self}));
self.$el.find('li').on('click', self.set_kanban_selection.bind(self));
});