diff options
| author | Joas Schilling <213943+nickvergessen@users.noreply.github.com> | 2023-08-11 13:40:22 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-08-11 13:40:22 +0200 |
| commit | d4a56ff6089ff8b66528afc1532e01dee430bec1 (patch) | |
| tree | b1b312d87fe6bb0bfcd5c681b7e4462c353e9abe | |
| parent | 03ce6924443dc9af1ca6dafc1cebb9abc4eb811f (diff) | |
| parent | a4c932b828c564494399def40d7864f86f7cf538 (diff) | |
Merge pull request #10185 from nextcloud/backport/10177/stable27v17.1.0-rc.1
[stable27] fix(MessageButtonsBar) - adjust predefined reminders conditions
| -rw-r--r-- | src/components/MessagesList/MessagesGroup/Message/MessageButtonsBar/MessageButtonsBar.vue | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/src/components/MessagesList/MessagesGroup/Message/MessageButtonsBar/MessageButtonsBar.vue b/src/components/MessagesList/MessagesGroup/Message/MessageButtonsBar/MessageButtonsBar.vue index d8f51329c..f3a045aec 100644 --- a/src/components/MessagesList/MessagesGroup/Message/MessageButtonsBar/MessageButtonsBar.vue +++ b/src/components/MessagesList/MessagesGroup/Message/MessageButtonsBar/MessageButtonsBar.vue @@ -554,21 +554,23 @@ export default { reminderOptions() { const currentDateTime = moment() - // Same day 18:00 PM (or hidden) - const laterTodayTime = (currentDateTime.hour() < 18) + // Same day 18:00 PM (hidden if after 17:00 PM now) + const laterTodayTime = (currentDateTime.hour() < 17) ? moment().hour(18) : null // Tomorrow 08:00 AM const tomorrowTime = moment().add(1, 'days').hour(8) - // Saturday 08:00 AM (or hidden) - const thisWeekendTime = (currentDateTime.day() !== 6 && currentDateTime.day() !== 0) + // Saturday 08:00 AM (hidden if Friday, Saturday or Sunday now) + const thisWeekendTime = (currentDateTime.day() > 0 && currentDateTime.day() < 5) ? moment().day(6).hour(8) : null - // Next Monday 08:00 AM - const nextWeekTime = moment().add(1, 'weeks').day(1).hour(8) + // Next Monday 08:00 AM (hidden if Sunday now) + const nextWeekTime = (currentDateTime.day() !== 0) + ? moment().add(1, 'weeks').day(1).hour(8) + : null return [ { |