[5.1] MSPB-292: Fix issue where user can't update from advanced to si…

…ngle date (#460)
2600hz · Sep 1, 2022 · 614efd6 · 614efd6
1 parent 587da11
commit 614efd6
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/submodules/strategy/strategy.js b/submodules/strategy/strategy.js
@@ -4316,7 +4316,7 @@ define(function(require) {
 					}, !formData.allDay && isSingleDate && {
 						time_window_start: $startTimepicker.timepicker('getSecondsFromMidnight'),
 						time_window_stop: $endTimepicker.timepicker('getSecondsFromMidnight')
-					}, ((isHolidayStartDate && formData.allDay && isSingleDate) || (isHolidayStartDate && isNotSingleDate)) && {
+					}, holidayId && ((isHolidayStartDate && formData.allDay && isSingleDate) || (isHolidayStartDate && isNotSingleDate)) && {
 						time_window_start: null,
 						time_window_stop: null
 					}),

diff --git a/submodules/strategyHolidays/strategyHolidays.js b/submodules/strategyHolidays/strategyHolidays.js
@@ -468,6 +468,7 @@ define(function(require) {
 								if (_.isUndefined(holidayRule.holidayData.excludeYear)) {
 									holidayRule.holidayData.excludeYear = [];
 								}
+
 								holidayRule.holidayData.excludeYear.push(yearSelected);
 								holidayRule.modified = true;
 								self.appFlags.strategyHolidays.allHolidays[key] = holidayRule;
@@ -477,6 +478,9 @@ define(function(require) {
 									_.omit(data, ['holidayData.id'])
 								);
 							} else {
+								if (holidayRule.holidayType === 'advanced' && data.holidayType !== 'advanced') {
+									data.holidayData.ordinal = null;
+								}
 								self.appFlags.strategyHolidays.allHolidays[key] = data;
 							}
 						}
@@ -1044,9 +1048,12 @@ define(function(require) {
 						holidayRule.days = _.range(fromDay, toDay + 1);
 					}
 				} else {
-					holidayRule.ordinal = holidayData.ordinal;
 					holidayRule.wdays = [holidayData.wday];
 				}
+
+				if (holidayData.hasOwnProperty('ordinal')) {
+					holidayRule.ordinal = holidayData.ordinal;
+				}
 			}
 
 			if (holidayData.excludeYear) {