From b94f2710a8b90fa4edf4798fb959d6b576d74d36 Mon Sep 17 00:00:00 2001 From: Akhil Narang Date: Tue, 23 Apr 2024 12:59:46 +0530 Subject: [PATCH] Revert "fix(grid_row): check child table dependent properties whenever a row is selected" (#26110) (cherry picked from commit 1620da5c17a9a0ebb45e0fa5ed6c1b8a751432d3) --- frappe/public/js/frappe/form/grid_row.js | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/frappe/public/js/frappe/form/grid_row.js b/frappe/public/js/frappe/form/grid_row.js index d70d6bcc19e..79bca563e80 100644 --- a/frappe/public/js/frappe/form/grid_row.js +++ b/frappe/public/js/frappe/form/grid_row.js @@ -725,12 +725,20 @@ export default class GridRow { } set_dependant_property(df) { - if (df.mandatory_depends_on) { - df.reqd = !!this.evaluate_depends_on_value(df.mandatory_depends_on); + if ( + !df.reqd && + df.mandatory_depends_on && + this.evaluate_depends_on_value(df.mandatory_depends_on) + ) { + df.reqd = 1; } - if (df.read_only_depends_on) { - df.read_only = !!this.evaluate_depends_on_value(df.read_only_depends_on); + if ( + !df.read_only && + df.read_only_depends_on && + this.evaluate_depends_on_value(df.read_only_depends_on) + ) { + df.read_only = 1; } } @@ -974,13 +982,6 @@ export default class GridRow { if (frappe.ui.form.editable_row !== me) { var out = me.toggle_editable_row(); } - - // Set dependant property for current row - Object.keys(me.columns).forEach((column) => { - me.set_dependant_property(me.columns[column].df); - }); - me.render_row(true); - var col = this; let first_input_field = $(col).find('input[type="Text"]:first'); let input_in_focus = false;