pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[FIX] web: kanbanSelection widget : labels are not mandatory

Browse Source 
Coming from hr_recruitment, where kanban_state is displayed, but without the customization
Also, remove lingering options in view, and missing fields for project_issue
This commit is contained in:
Yannick Tivisse
2015-09-22 17:08:55 +02:00
parent b15775c731
commit 0d1240684a
4 changed files with 17 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/project_issue/project_issue.py
+3
View File
@@ -184,6 +184,9 @@ class project_issue(osv.Model):
'user_email': fields.related('user_id', 'email', type='char', string='User Email', readonly=True),
'date_action_last': fields.datetime('Last Action', readonly=1),
'date_action_next': fields.datetime('Next Action', readonly=1),
'legend_blocked': fields.related("stage_id", "legend_blocked", type="char", string='Kanban Blocked Explanation'),
'legend_done': fields.related("stage_id", "legend_done", type="char", string='Kanban Valid Explanation'),
'legend_normal': fields.related("stage_id", "legend_normal", type="char", string='Kanban Ongoing Explanation'),
}
_defaults = {
addons/project_issue/project_issue_view.xml
+8 -7
View File
@@ -19,11 +19,7 @@
options='{"terminology": "archive"}'/>
</button>
</div>
<field name="kanban_state" class="oe_inline" widget="kanban_state_selection"
options='{
"states_legend_field": "stage_id",
"states_legend": {"normal": "legend_normal", "blocked": "legend_blocked", "done": "legend_done"}
}'/>
<field name="kanban_state" class="oe_inline" widget="kanban_state_selection"/>
<div class="oe_title">
<h1><field name="name" placeholder="Issue Summary..."/></h1>
</div>
@@ -55,6 +51,9 @@
<field name="working_hours_close" widget="float_time"/>
<field name="inactivity_days"/>
<field name="days_since_creation"/>
<field name="legend_blocked" invisible="1"/>
<field name="legend_done" invisible="1"/>
<field name="legend_normal" invisible="1"/>
</group>
</group>
</page>
@@ -149,6 +148,9 @@
<field name="date_deadline"/>
<field name="message_needaction_counter"/>
<field name="active"/>
<field name="legend_blocked"/>
<field name="legend_done"/>
<field name="legend_normal"/>
<templates>
<t t-name="kanban-tooltip">
<ul class="oe_kanban_tooltip">
@@ -184,8 +186,7 @@
<div class="oe_kanban_bottom_right">
<img t-att-src="kanban_image('res.users', 'image_small', record.user_id.raw_value)" t-att-title="record.user_id.value" width="24" height="24" class="oe_kanban_avatar pull-right"/>
<div class="pull-left" groups="base.group_user">
<field name="kanban_state" widget="kanban_state_selection"
options='{"states_legend": {"normal": "legend_normal", "blocked": "legend_blocked", "done": "legend_done"}}'/>
<field name="kanban_state" widget="kanban_state_selection"/>
</div>
</div>
</div>
addons/web/static/src/js/views/form_widgets.js
+3 -3
View File
@@ -184,9 +184,9 @@ var KanbanSelection = FieldChar.extend({
var current_stage_id = self.view.datarecord.stage_id[0];
var stage_data = {
id: current_stage_id,
legend_normal: self.view.datarecord.legend_normal,
legend_blocked : self.view.datarecord.legend_blocked,
legend_done: self.view.datarecord.legend_done,
legend_normal: self.view.datarecord.legend_normal || undefined,
legend_blocked : self.view.datarecord.legend_blocked || undefined,
legend_done: self.view.datarecord.legend_done || undefined,
};
_.map(self.field.selection || [], function(selection_item) {
var value = {
addons/web_kanban/static/src/js/kanban_widgets.js
+3 -3
View File
@@ -109,9 +109,9 @@ var KanbanSelection = AbstractField.extend({
var stage_id = self.parent.values.stage_id.value[0];
var stage_data = {
id: stage_id,
legend_normal: self.parent.values.legend_normal.value,
legend_blocked : self.parent.values.legend_blocked.value,
legend_done: self.parent.values.legend_done.value,
legend_normal: self.parent.values.legend_normal ? self.parent.values.legend_normal.value : undefined,
legend_blocked: self.parent.values.legend_blocked ? self.parent.values.legend_blocked.value: undefined,
legend_done: self.parent.values.legend_done ? self.parent.values.legend_done.value: undefined,
};
_.map(self.field.selection || [], function(res) {
var value = {