Skip to content

Commit

Permalink
fix: added text editor dialog on hide action (frappe#17117)
Browse files Browse the repository at this point in the history
* fix: added text editor dialog on hide action

When we edit text editor field and close the dialog the cell in datatable is empty

* chore: bump datatable to 1.16.4
  • Loading branch information
shariquerik authored Jun 9, 2022
1 parent 491b5b0 commit f96c623
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 6 deletions.
4 changes: 3 additions & 1 deletion frappe/public/js/frappe/views/reports/report_view.js
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
8 changes: 4 additions & 4 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down

0 comments on commit f96c623

Please sign in to comment.