mirror of
https://github.com/nextcloud/server.git
synced 2026-06-06 07:13:23 -04:00
Merge pull request #43248 from nextcloud/fix/clear-status-after-predefined
fix(user_status): Fix status update request not being sent
This commit is contained in:
commit
f6dba9620f
5 changed files with 11 additions and 17 deletions
|
|
@ -125,7 +125,6 @@ export default {
|
|||
return {
|
||||
clearAt: null,
|
||||
editedMessage: '',
|
||||
isCustomStatus: true,
|
||||
isSavingStatus: false,
|
||||
statuses: getAllStatusOptions(),
|
||||
}
|
||||
|
|
@ -213,7 +212,6 @@ export default {
|
|||
* @param {string} icon The new icon
|
||||
*/
|
||||
setIcon(icon) {
|
||||
this.isCustomStatus = true
|
||||
this.$store.dispatch('setCustomMessage', {
|
||||
message: this.message,
|
||||
icon,
|
||||
|
|
@ -229,7 +227,6 @@ export default {
|
|||
* @param {string} message The new message
|
||||
*/
|
||||
setMessage(message) {
|
||||
this.isCustomStatus = true
|
||||
this.editedMessage = message
|
||||
},
|
||||
/**
|
||||
|
|
@ -246,7 +243,6 @@ export default {
|
|||
* @param {object} status The predefined status object
|
||||
*/
|
||||
selectPredefinedMessage(status) {
|
||||
this.isCustomStatus = false
|
||||
this.clearAt = status.clearAt
|
||||
this.$store.dispatch('setPredefinedMessage', {
|
||||
messageId: status.id,
|
||||
|
|
@ -266,13 +262,11 @@ export default {
|
|||
try {
|
||||
this.isSavingStatus = true
|
||||
|
||||
if (this.isCustomStatus) {
|
||||
await this.$store.dispatch('setCustomMessage', {
|
||||
message: this.editedMessage,
|
||||
icon: this.icon,
|
||||
clearAt: this.clearAt,
|
||||
})
|
||||
}
|
||||
await this.$store.dispatch('setCustomMessage', {
|
||||
message: this.editedMessage,
|
||||
icon: this.icon,
|
||||
clearAt: this.clearAt,
|
||||
})
|
||||
} catch (err) {
|
||||
showError(this.$t('user_status', 'There was an error saving the status'))
|
||||
console.debug(err)
|
||||
|
|
|
|||
4
dist/user-status-modal-5133.js
vendored
4
dist/user-status-modal-5133.js
vendored
File diff suppressed because one or more lines are too long
2
dist/user-status-modal-5133.js.map
vendored
2
dist/user-status-modal-5133.js.map
vendored
File diff suppressed because one or more lines are too long
4
dist/user_status-menu.js
vendored
4
dist/user_status-menu.js
vendored
File diff suppressed because one or more lines are too long
2
dist/user_status-menu.js.map
vendored
2
dist/user_status-menu.js.map
vendored
File diff suppressed because one or more lines are too long
Loading…
Reference in a new issue