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

Merge branch 'develop' into fix/user-type

Browse source
This commit is contained in:
Sagar Sharma 2022-06-09 02:13:09 -07:00 • committed by GitHub
commit f989cb7de2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -624,9 +624,11 @@ frappe.views.ReportView = class ReportView extends frappe.views.ListView {
title: __('Edit {0}', [col.docfield.label]),
fields: [col.docfield],
primary_action: () => {
this.datatable.cellmanager.submitEditing();
this.datatable.cellmanager.deactivateEditing();
d.hide();
},
on_hide: () => {
this.datatable.cellmanager.deactivateEditing(false);
}
});
d.show();

2
package.json
View file

@ -35,7 +35,7 @@
"express": "^4.17.1",
"fast-deep-equal": "^2.0.1",
"frappe-charts": "^2.0.0-rc13",
"frappe-datatable": "^1.16.1",
"frappe-datatable": "^1.16.4",
"frappe-gantt": "^0.6.0",
"fuse.js": "^3.4.6",
"highlight.js": "^10.4.1",

8
yarn.lock
View file

@ -1780,10 +1780,10 @@ frappe-charts@^2.0.0-rc13:
resolved "https://registry.yarnpkg.com/frappe-charts/-/frappe-charts-2.0.0-rc13.tgz#fdb251d7ae311c41e38f90a3ae108070ec6b9072"
integrity sha512-Bv7IfllIrjRbKWHn5b769dOSenqdBixAr6m5kurf8ZUOJSLOgK4HOXItJ7BA8n9PvviH9/k5DaloisjLM2Bm1w==
frappe-datatable@^1.16.1:
version "1.16.1"
resolved "https://registry.yarnpkg.com/frappe-datatable/-/frappe-datatable-1.16.1.tgz#a5844b7ad8259ef45606608f492ca4b343006818"
integrity sha512-TRj3459YWyJdoP9MgHfOAEq7ylyoT3TVkwxLQGEmn5Xj6UAJOFa7F9j4TaWnFXW8tuoy69z/TktDclOurMeT2w==
frappe-datatable@^1.16.4:
version "1.16.4"
resolved "https://registry.yarnpkg.com/frappe-datatable/-/frappe-datatable-1.16.4.tgz#cb26f197c3cd404a5b13f016ef81c394e06f56fe"
integrity sha512-VoiTLnkuObMa3FxITrvP32UYN9v4WQ0j4qlCiDuqdXha9/BVSxwDt2BTK+cvaRloGcds5G2Hm9IRbltRRGGhxA==
dependencies:
hyperlist "^1.0.0-beta"
lodash "^4.17.5"