From 569c6b94c95675dd2d898c79d100a1a6e3578d9c Mon Sep 17 00:00:00 2001 From: graham-jobber <156007175+graham-jobber@users.noreply.github.com> Date: Fri, 7 Mar 2025 13:31:40 -0800 Subject: [PATCH 1/2] JOB-114319 Fix JS error for option value 0 --- app/assets/javascripts/recurring_select_dialog.js.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/assets/javascripts/recurring_select_dialog.js.erb b/app/assets/javascripts/recurring_select_dialog.js.erb index bd60f62a..dbc20cfa 100644 --- a/app/assets/javascripts/recurring_select_dialog.js.erb +++ b/app/assets/javascripts/recurring_select_dialog.js.erb @@ -77,7 +77,7 @@ class RecurringSelectDialog { freqInit() { this.freq_select = this.outer_holder.querySelector(".rs_frequency"); const rule_type = this.current_rule.hash && this.current_rule.hash.rule_type - if (this.current_rule.hash != null && rule_type != null) { + if (this.current_rule.hash != null && rule_type) { if (rule_type.search(/Weekly/) !== -1) { this.freq_select.selectedIndex = 1 this.initWeeklyOptions(); From 727a783fe892ef5162c46bd811923c2d664d0e1b Mon Sep 17 00:00:00 2001 From: graham-jobber <156007175+graham-jobber@users.noreply.github.com> Date: Fri, 7 Mar 2025 13:40:20 -0800 Subject: [PATCH 2/2] Simplify logic --- app/assets/javascripts/recurring_select_dialog.js.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/assets/javascripts/recurring_select_dialog.js.erb b/app/assets/javascripts/recurring_select_dialog.js.erb index dbc20cfa..9956a437 100644 --- a/app/assets/javascripts/recurring_select_dialog.js.erb +++ b/app/assets/javascripts/recurring_select_dialog.js.erb @@ -77,7 +77,7 @@ class RecurringSelectDialog { freqInit() { this.freq_select = this.outer_holder.querySelector(".rs_frequency"); const rule_type = this.current_rule.hash && this.current_rule.hash.rule_type - if (this.current_rule.hash != null && rule_type) { + if (rule_type) { if (rule_type.search(/Weekly/) !== -1) { this.freq_select.selectedIndex = 1 this.initWeeklyOptions();