Merge pull request #31290 from akhilnarang/fix-reportview-edit-if-has-table
fix(report_view): don't disallow editing just if a table exists
This commit is contained in:
commit
ef4ffbb304
1 changed files with 10 additions and 6 deletions
|
|
@ -702,7 +702,7 @@ frappe.views.ReportView = class ReportView extends frappe.views.ListView {
|
|||
}
|
||||
|
||||
is_editable(df, data) {
|
||||
return (
|
||||
if (
|
||||
df &&
|
||||
frappe.model.can_write(this.doctype) &&
|
||||
// not a submitted doc or field is allowed to edit after submit
|
||||
|
|
@ -713,12 +713,16 @@ frappe.views.ReportView = class ReportView extends frappe.views.ListView {
|
|||
!df.is_virtual &&
|
||||
!df.hidden &&
|
||||
// not a standard field i.e., owner, modified_by, etc.
|
||||
frappe.model.is_non_std_field(df.fieldname) &&
|
||||
frappe.model.is_non_std_field(df.fieldname)
|
||||
) {
|
||||
// don't check read_only_depends_on if there's child table fields
|
||||
!this.meta.fields.some((df) => df.fieldtype === "Table") &&
|
||||
df.read_only_depends_on &&
|
||||
!this.evaluate_read_only_depends_on(df.read_only_depends_on, data)
|
||||
);
|
||||
return (
|
||||
this.meta.fields.some((df) => df.fieldtype === "Table") ||
|
||||
(df.read_only_depends_on &&
|
||||
!this.evaluate_read_only_depends_on(df.read_only_depends_on, data))
|
||||
);
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
get_data(values) {
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue