[5.1] MSPB-261: Avoid duplicated holidays after edited (#439)

2600hz · Jul 16, 2022 · fc88d48 · fc88d48
1 parent 65cbdd2
commit fc88d48
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 2 deletions.
diff --git a/submodules/strategy/strategy.js b/submodules/strategy/strategy.js
@@ -4282,7 +4282,6 @@ define(function(require) {
 			$template.on('submit', function(event) {
 				event.preventDefault();
 
-				console.log(holidayRule);
 				var formData = monster.ui.getFormData('form_add_edit_office_holidays'),
 					$optionDiv = $template.find('.row-fluid.' + formData.type + ' select:not(.hide)'),
 					endYear = $template.find('.optional-year.show .select-year').val(),

diff --git a/submodules/strategyHolidays/strategyHolidays.js b/submodules/strategyHolidays/strategyHolidays.js
@@ -450,7 +450,7 @@ define(function(require) {
 					callback: function(err, data) {
 						/*Compare old holidayData with new holidayData if it's recurring*/
 						var isOldRecurring = _.get(holidayRule, 'holidayData.recurring', false),
-							isNewRecurring = _.get(holidayRule, 'data.recurring', false);
+							isNewRecurring = _.get(data, 'holidayData.recurring', false);
 
 						if (isOldRecurring && (isOldRecurring !== isNewRecurring)) {
 							/* update existing rule */