chore: merge upstream changes
All checks were successful
continuous-integration/drone/pr Build is passing
All checks were successful
continuous-integration/drone/pr Build is passing
This commit is contained in:
parent
9d67a5f628
commit
7bd6e910c3
|
@ -1513,24 +1513,21 @@ func (t *Task) overwriteRemindersWithReminderDates(reminderDates []time.Time) {
|
||||||
func updateRelativeReminderDates(task *Task) (err error) {
|
func updateRelativeReminderDates(task *Task) (err error) {
|
||||||
for _, reminder := range task.Reminders {
|
for _, reminder := range task.Reminders {
|
||||||
relativeDuration := time.Duration(reminder.RelativePeriod) * time.Second
|
relativeDuration := time.Duration(reminder.RelativePeriod) * time.Second
|
||||||
|
if reminder.RelativeTo != "" {
|
||||||
|
reminder.Reminder = time.Time{}
|
||||||
|
}
|
||||||
switch reminder.RelativeTo {
|
switch reminder.RelativeTo {
|
||||||
case ReminderRelationDueDate:
|
case ReminderRelationDueDate:
|
||||||
if !task.DueDate.IsZero() {
|
if !task.DueDate.IsZero() {
|
||||||
reminder.Reminder = task.DueDate.Add(relativeDuration)
|
reminder.Reminder = task.DueDate.Add(relativeDuration)
|
||||||
} else {
|
|
||||||
reminder.Reminder = time.Time{}
|
|
||||||
}
|
}
|
||||||
case ReminderRelationStartDate:
|
case ReminderRelationStartDate:
|
||||||
if !task.StartDate.IsZero() {
|
if !task.StartDate.IsZero() {
|
||||||
reminder.Reminder = task.StartDate.Add(relativeDuration)
|
reminder.Reminder = task.StartDate.Add(relativeDuration)
|
||||||
} else {
|
|
||||||
reminder.Reminder = time.Time{}
|
|
||||||
}
|
}
|
||||||
case ReminderRelationEndDate:
|
case ReminderRelationEndDate:
|
||||||
if !task.EndDate.IsZero() {
|
if !task.EndDate.IsZero() {
|
||||||
reminder.Reminder = task.EndDate.Add(relativeDuration)
|
reminder.Reminder = task.EndDate.Add(relativeDuration)
|
||||||
} else {
|
|
||||||
reminder.Reminder = time.Time{}
|
|
||||||
}
|
}
|
||||||
default:
|
default:
|
||||||
if reminder.RelativePeriod != 0 {
|
if reminder.RelativePeriod != 0 {
|
||||||
|
|
Loading…
Reference in New Issue
Block a user