vassili/seitime-frappe
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Reportview fix (#5397)

Browse source 
- fixes frappe/erpnext#13201
- update frappe-datatable
This commit is contained in:
Faris Ansari 2018-04-08 12:59:33 +05:30 • committed by GitHub
parent da3e726fde
commit 762f9c37ee
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 10 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
frappe/public/js/frappe/ui/filters/filter_list.js
View file

@ -126,7 +126,7 @@ frappe.ui.FilterGroup = class {
}
clear_filters() {
this.filters.map(f => { f.remove(true); });
this.filters.map(f => f.remove(true));
// {}: Clear page filters, .date-range-picker (called list run())
this.filters = [];
}

13
frappe/public/js/frappe/views/reports/report_view.js
View file

@ -738,7 +738,10 @@ frappe.views.ReportView = class ReportView extends frappe.views.ListView {
name: title,
content: title,
width: (docfield ? cint(docfield.width) : null) || null,
editable: editable
editable: editable,
format: (value, row, column, data) => {
return frappe.format(value, column.docfield, { always_show_decimals: true }, data);
}
};
}
@ -799,13 +802,7 @@ frappe.views.ReportView = class ReportView extends frappe.views.ListView {
name: d.name,
doctype: col.docfield.parent,
content: value,
editable: this.is_editable(col.docfield, d),
format: value => {
if (col.field === 'name') {
return frappe.utils.get_form_link(this.doctype, value, true);
}
return frappe.format(value, col.docfield, { always_show_decimals: true }, d);
}
editable: this.is_editable(col.docfield, d)
};
}
return {

2
package.json
View file

@ -18,7 +18,7 @@
"dependencies": {
"cookie": "^0.3.1",
"express": "^4.16.2",
"frappe-datatable": "^0.0.3",
"frappe-datatable": "^0.0.4",
"frappe-gantt": "^0.1.0",
"fuse": "^0.4.0",
"fuse.js": "^3.2.0",

6
yarn.lock
View file

@ -862,9 +862,9 @@ forwarded@~0.1.2:
version "0.1.2"
resolved "https://registry.yarnpkg.com/forwarded/-/forwarded-0.1.2.tgz#98c23dab1175657b8c0573e8ceccd91b0ff18c84"
frappe-datatable@^0.0.3:
version "0.0.3"
resolved "https://registry.yarnpkg.com/frappe-datatable/-/frappe-datatable-0.0.3.tgz#55d3fd7bafdf2a7380efab2ae2aaaa956624fca0"
frappe-datatable@^0.0.4:
version "0.0.4"
resolved "https://registry.yarnpkg.com/frappe-datatable/-/frappe-datatable-0.0.4.tgz#3fdcd698c2cd7bf7d75e920ed9d2f04f69e3afc9"
dependencies:
clusterize.js "^0.18.0"
lodash "^4.17.5"