From fc88d48aa2722346dd8b225fdcd6f77cd94878e2 Mon Sep 17 00:00:00 2001 From: Ricardo Merino Date: Fri, 15 Jul 2022 18:20:24 -0600 Subject: [PATCH] [5.1] MSPB-261: Avoid duplicated holidays after edited (#439) --- submodules/strategy/strategy.js | 1 - submodules/strategyHolidays/strategyHolidays.js | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/submodules/strategy/strategy.js b/submodules/strategy/strategy.js index f1c3d069..2331d1f3 100644 --- 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 index 620fe234..54fa15ef 100644 --- 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 */