Merge pull request frappe#23921 from shariquerik/minor-fix-1

chore: minor fix
maharshivpatel · Dec 23, 2023 · 77f04c9 · 77f04c9
2 parents c26ccad + fc13ff5
commit 77f04c9
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 19 deletions.
diff --git a/frappe/desk/page/setup_wizard/setup_wizard.js b/frappe/desk/page/setup_wizard/setup_wizard.js
@@ -349,12 +349,16 @@ frappe.setup.SetupWizardSlide = class SetupWizardSlide extends frappe.ui.Slide {
 	setup_telemetry_events() {
 		let me = this;
 		this.fields.filter(frappe.model.is_value_type).forEach((field) => {
-			me.get_input(field.fieldname).on("change", function () {
-				frappe.telemetry.capture(`${field.fieldname}_set`, "setup");
-				if (field.fieldname == "enable_telemetry" && !me.get_value("enable_telemetry")) {
-					frappe.telemetry.disable();
-				}
-			});
+			field.fieldname &&
+				me.get_input(field.fieldname)?.on("change", function () {
+					frappe.telemetry.capture(`${field.fieldname}_set`, "setup");
+					if (
+						field.fieldname == "enable_telemetry" &&
+						!me.get_value("enable_telemetry")
+					) {
+						frappe.telemetry.disable();
+					}
+				});
 		});
 	}
 };

diff --git a/frappe/public/js/frappe/ui/field_group.js b/frappe/public/js/frappe/ui/field_group.js
@@ -17,7 +17,7 @@ frappe.ui.FieldGroup = class FieldGroup extends frappe.ui.form.Layout {
 	}
 
 	make() {
-		var me = this;
+		let me = this;
 		if (this.fields) {
 			super.make();
 			this.refresh();
@@ -63,7 +63,7 @@ frappe.ui.FieldGroup = class FieldGroup extends frappe.ui.form.Layout {
 	}
 
 	catch_enter_as_submit() {
-		var me = this;
+		let me = this;
 		$(this.body)
 			.find('input[type="text"], input[type="password"], select')
 			.keypress(function (e) {
@@ -77,7 +77,8 @@ frappe.ui.FieldGroup = class FieldGroup extends frappe.ui.form.Layout {
 	}
 
 	get_input(fieldname) {
-		var field = this.fields_dict[fieldname];
+		let field = this.fields_dict[fieldname];
+		if (!field) return "";
 		return $(field.txt ? field.txt : field.input);
 	}
 
@@ -86,14 +87,14 @@ frappe.ui.FieldGroup = class FieldGroup extends frappe.ui.form.Layout {
 	}
 
 	get_values(ignore_errors, check_invalid) {
-		var ret = {};
-		var errors = [];
+		let ret = {};
+		let errors = [];
 		let invalid = [];
 
-		for (var key in this.fields_dict) {
-			var f = this.fields_dict[key];
+		for (let key in this.fields_dict) {
+			let f = this.fields_dict[key];
 			if (f.get_value) {
-				var v = f.get_value();
+				let v = f.get_value();
 				if (f.df.reqd && is_null(typeof v === "string" ? strip_html(v) : v))
 					errors.push(__(f.df.label));
 
@@ -141,13 +142,13 @@ frappe.ui.FieldGroup = class FieldGroup extends frappe.ui.form.Layout {
 	}
 
 	get_value(key) {
-		var f = this.fields_dict[key];
+		let f = this.fields_dict[key];
 		return f && (f.get_value ? f.get_value() : null);
 	}
 
 	set_value(key, val) {
 		return new Promise((resolve) => {
-			var f = this.fields_dict[key];
+			let f = this.fields_dict[key];
 			if (f) {
 				f.set_value(val).then(() => {
 					f.set_input?.(val);
@@ -170,7 +171,7 @@ frappe.ui.FieldGroup = class FieldGroup extends frappe.ui.form.Layout {
 
 	set_values(dict) {
 		let promises = [];
-		for (var key in dict) {
+		for (let key in dict) {
 			if (this.fields_dict[key]) {
 				promises.push(this.set_value(key, dict[key]));
 			}
@@ -180,8 +181,8 @@ frappe.ui.FieldGroup = class FieldGroup extends frappe.ui.form.Layout {
 	}
 
 	clear() {
-		for (var key in this.fields_dict) {
-			var f = this.fields_dict[key];
+		for (let key in this.fields_dict) {
+			let f = this.fields_dict[key];
 			if (f && f.set_input) {
 				f.set_input(f.df["default"] || "");
 			}