diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-08-18 11:17:02 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-08-18 11:17:02 +0300 |
commit | b39512ed755239198a9c294b6a45e65c05900235 (patch) | |
tree | d234a3efade1de67c46b9e5a38ce813627726aa7 /app/assets/javascripts/set_status_modal/set_status_modal_wrapper.vue | |
parent | d31474cf3b17ece37939d20082b07f6657cc79a9 (diff) |
Add latest changes from gitlab-org/gitlab@15-3-stable-eev15.3.0-rc42
Diffstat (limited to 'app/assets/javascripts/set_status_modal/set_status_modal_wrapper.vue')
-rw-r--r-- | app/assets/javascripts/set_status_modal/set_status_modal_wrapper.vue | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/app/assets/javascripts/set_status_modal/set_status_modal_wrapper.vue b/app/assets/javascripts/set_status_modal/set_status_modal_wrapper.vue index 579316f481c..2cdec8fc481 100644 --- a/app/assets/javascripts/set_status_modal/set_status_modal_wrapper.vue +++ b/app/assets/javascripts/set_status_modal/set_status_modal_wrapper.vue @@ -91,7 +91,7 @@ export default { modalId: 'set-user-status-modal', noEmoji: true, availability: isUserBusy(this.currentAvailability), - clearStatusAfter: statusTimeRanges[0].label, + clearStatusAfter: statusTimeRanges[0], clearStatusAfterMessage: sprintf(s__('SetStatusModal|Your status resets on %{date}.'), { date: this.currentClearStatusAfter, }), @@ -178,9 +178,7 @@ export default { message, availability: availability ? AVAILABILITY_STATUS.BUSY : AVAILABILITY_STATUS.NOT_SET, clearStatusAfter: - clearStatusAfter === statusTimeRanges[0].label - ? null - : clearStatusAfter.replace(' ', '_'), + clearStatusAfter.label === statusTimeRanges[0].label ? null : clearStatusAfter.shortcut, }) .then(this.onUpdateSuccess) .catch(this.onUpdateFail); @@ -279,12 +277,12 @@ export default { <div class="form-group"> <div class="gl-display-flex gl-align-items-baseline"> <span class="gl-mr-3">{{ s__('SetStatusModal|Clear status after') }}</span> - <gl-dropdown :text="clearStatusAfter" data-testid="clear-status-at-dropdown"> + <gl-dropdown :text="clearStatusAfter.label" data-testid="clear-status-at-dropdown"> <gl-dropdown-item v-for="after in $options.statusTimeRanges" :key="after.name" :data-testid="after.name" - @click="setClearStatusAfter(after.label)" + @click="setClearStatusAfter(after)" >{{ after.label }}</gl-dropdown-item > </gl-dropdown> |