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

Merge pull request #14386 from rohitwaghchaure/fixed-dialog-box-not-showing

Browse source 
fix: custom dialog box not working
This commit is contained in:
rohitwaghchaure 2021-10-07 16:51:44 +05:30 • committed by GitHub
commit 660f187ce5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
frappe/public/js/frappe/form/grid.js
View file

@ -773,16 +773,18 @@ export default class Grid {
}
setup_user_defined_columns() {
let user_settings = frappe.get_user_settings(this.frm.doctype, 'GridView');
if (user_settings && user_settings[this.doctype] && user_settings[this.doctype].length) {
this.user_defined_columns = user_settings[this.doctype].map(row => {
let column = frappe.meta.get_docfield(this.doctype, row.fieldname);
if (column) {
column.in_list_view = 1;
column.columns = row.columns;
return column;
}
});
if (this.frm) {
let user_settings = frappe.get_user_settings(this.frm.doctype, 'GridView');
if (user_settings && user_settings[this.doctype] && user_settings[this.doctype].length) {
this.user_defined_columns = user_settings[this.doctype].map(row => {
let column = frappe.meta.get_docfield(this.doctype, row.fieldname);
if (column) {
column.in_list_view = 1;
column.columns = row.columns;
return column;
}
});
}
}
}

2
frappe/public/js/frappe/form/grid_row.js
View file

@ -497,7 +497,7 @@ export default class GridRow {
}
update_user_settings_for_grid() {
if (!this.selected_columns_for_grid) {
if (!this.selected_columns_for_grid || !this.frm) {
return;
}