zware/awx
1
0
Fork 0
mirror of https://github.com/ZwareBear/awx.git synced 2026-03-20 07:43:35 -05:00
Code Issues Packages Projects Releases Wiki Activity

fix error message on new schedules with no instances

Browse Source
This commit is contained in:
Keith J. Grant
2022-09-12 12:58:25 -07:00
parent 078c3ae6d8
commit 1e952bab95
1 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
awx/ui/src/components/Schedule/shared/buildRuleSet.js
View File

@@ -4,15 +4,17 @@ import buildRuleObj, { buildDtStartObj } from './buildRuleObj';
window.RRuleSet = RRuleSet; window.RRuleSet = RRuleSet;
const frequencies = ['minute', 'hour', 'day', 'week', 'month', 'year']; const frequencies = ['minute', 'hour', 'day', 'week', 'month', 'year'];
export default function buildRuleSet(values, includeStart) { export default function buildRuleSet(values, useUTCStart) {
const set = new RRuleSet(); const set = new RRuleSet();
const startRule = buildDtStartObj({ if (!useUTCStart) {
startDate: values.startDate, const startRule = buildDtStartObj({
startTime: values.startTime, startDate: values.startDate,
timezone: values.timezone, startTime: values.startTime,
}); timezone: values.timezone,
set.rrule(startRule); });
set.rrule(startRule);
}
if (values.frequency.length === 0) { if (values.frequency.length === 0) {
const rule = buildRuleObj( const rule = buildRuleObj(
@@ -23,7 +25,7 @@ export default function buildRuleSet(values, includeStart) {
frequency: 'none', frequency: 'none',
interval: 1, interval: 1,
}, },
includeStart useUTCStart
); );
set.rrule(new RRule(rule)); set.rrule(new RRule(rule));
} }
@@ -40,7 +42,7 @@ export default function buildRuleSet(values, includeStart) {
frequency, frequency,
...values.frequencyOptions[frequency], ...values.frequencyOptions[frequency],
}, },
includeStart useUTCStart
); );
set.rrule(new RRule(rule)); set.rrule(new RRule(rule));
}); });
@@ -57,7 +59,7 @@ export default function buildRuleSet(values, includeStart) {
frequency, frequency,
...values.exceptionOptions[frequency], ...values.exceptionOptions[frequency],
}, },
includeStart useUTCStart
); );
set.exrule(new RRule(rule)); set.exrule(new RRule(rule));
}); });