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

[FIX] crm: avoid clash on attribute name

Browse Source 
The sum is already used in views for
   <field name="foo" sum="Total" />

Where "Total" is translatable and extracted in source terms export.

The progress bar kanban widget expect a field name (untranslatable).

Avoid to translate a field name by changing the attribute
This commit is contained in:
Martin Trigaux
2017-10-02 11:46:55 +02:00
parent ad2a93dc24
commit af297345c6
4 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/crm/views/crm_lead_views.xml
+1 -1
View File
@@ -302,7 +302,7 @@
<field name="company_currency"/>
<field name="activity_state" />
<field name="activity_ids" />
<progressbar field="activity_state" colors='{"planned": "success", "today": "warning", "overdue": "danger"}' sum="planned_revenue"/>
<progressbar field="activity_state" colors='{"planned": "success", "today": "warning", "overdue": "danger"}' sum_field="planned_revenue"/>
<templates>
<field name="date_deadline"/>
<t t-name="kanban-box">
addons/web/static/src/js/views/kanban/kanban_column_progressbar.js
+1 -1
View File
@@ -29,7 +29,7 @@ var KanbanColumnProgressBar = Widget.extend({
// <progressbar/> attributes
this.fieldName = columnState.progressBarValues.field;
this.colors = columnState.progressBarValues.colors;
this.sumField = columnState.progressBarValues.sum;
this.sumField = columnState.progressBarValues.sum_field;
// Previous progressBar state
var state = options.progressBarStates[this.columnID];
addons/web/static/src/js/views/kanban/kanban_view.js
+1 -1
View File
@@ -44,7 +44,7 @@ var KanbanView = BasicView.extend({
if (isProgressBar) {
progressBar = _.clone(n.attrs);
progressBar.colors = JSON.parse(progressBar.colors);
progressBar.sum = progressBar.sum || false;
progressBar.sum_field = progressBar.sum_field || false;
}
return !isProgressBar;
});
addons/web/static/tests/views/kanban_tests.js
+1 -1
View File
@@ -2009,7 +2009,7 @@ QUnit.module('Views', {
'<kanban>' +
'<field name="bar"/>' +
'<field name="int_field"/>' +
'<progressbar field="foo" colors=\'{"yop": "success", "gnap": "warning", "blip": "danger"}\' sum="int_field"/>' +
'<progressbar field="foo" colors=\'{"yop": "success", "gnap": "warning", "blip": "danger"}\' sum_field="int_field"/>' +
'<templates><t t-name="kanban-box">' +
'<div>' +
'<field name="name"/>' +