зеркало из https://github.com/nextcloud/spreed.git
Merge pull request #6055 from nextcloud/bugfix/noid/forward-message-followup
Bugfix/noid/forward message followup
This commit is contained in:
Коммит
855273a4af
|
@ -29,7 +29,7 @@
|
|||
:show-postable-only="true"
|
||||
:dialog-title="dialogTitle"
|
||||
:dialog-subtitle="dialogSubtitle"
|
||||
@select="setselectedConversationToken"
|
||||
@select="setSelectedConversationToken"
|
||||
@close="handleClose" />
|
||||
|
||||
<!-- Second step of the flow: confirmation modal that gives the user
|
||||
|
@ -58,6 +58,7 @@
|
|||
import RoomSelector from '../../../../../views/RoomSelector.vue'
|
||||
import EmptyContent from '@nextcloud/vue/dist/Components/EmptyContent'
|
||||
import Modal from '@nextcloud/vue/dist/Components/Modal'
|
||||
import { showError } from '@nextcloud/dialogs'
|
||||
|
||||
export default {
|
||||
name: 'Forwarder',
|
||||
|
@ -101,14 +102,20 @@ export default {
|
|||
},
|
||||
|
||||
methods: {
|
||||
async setselectedConversationToken(token) {
|
||||
async setSelectedConversationToken(token) {
|
||||
this.selectedConversationToken = token
|
||||
const response = await this.$store.dispatch('forwardMessage', {
|
||||
token,
|
||||
message: this.messageObject,
|
||||
})
|
||||
this.showForwardedConfirmation = true
|
||||
this.forwardedMessageID = response.data.ocs.data.id
|
||||
try {
|
||||
const response = await this.$store.dispatch('forwardMessage', {
|
||||
token,
|
||||
message: this.messageObject,
|
||||
})
|
||||
this.showForwardedConfirmation = true
|
||||
this.forwardedMessageID = response.data.ocs.data.id
|
||||
} catch (error) {
|
||||
console.error('Error while forwarding message', error)
|
||||
showError(t('spreed', 'Error while forwarding message'))
|
||||
}
|
||||
|
||||
},
|
||||
|
||||
openConversation() {
|
||||
|
@ -118,7 +125,7 @@ export default {
|
|||
hash: `#message_${this.forwardedMessageID}`,
|
||||
params: {
|
||||
token: `${this.selectedConversationToken}`,
|
||||
},
|
||||
},
|
||||
})
|
||||
.catch(err => console.debug(`Error while pushing the new conversation's route: ${err}`))
|
||||
this.showForwardedConfirmation = false
|
||||
|
|
|
@ -35,7 +35,7 @@ import { showError } from '@nextcloud/dialogs'
|
|||
import {
|
||||
ATTENDEE,
|
||||
} from '../constants'
|
||||
import { cloneDeep } from 'lodash'
|
||||
import cloneDeep from 'lodash/cloneDeep'
|
||||
|
||||
/**
|
||||
* Returns whether the given message contains a mention to self, directly
|
||||
|
@ -887,13 +887,8 @@ const actions = {
|
|||
async forwardMessage(context, { token, message }) {
|
||||
const messageToBeForwarded = cloneDeep(message)
|
||||
messageToBeForwarded.token = token
|
||||
try {
|
||||
const response = await postNewMessage(messageToBeForwarded)
|
||||
return response
|
||||
} catch (error) {
|
||||
console.error('Error while forwarding message')
|
||||
showError(t('spreed', 'Error while forwarding message'))
|
||||
}
|
||||
const response = await postNewMessage(messageToBeForwarded)
|
||||
return response
|
||||
},
|
||||
}
|
||||
|
||||
|
|
Загрузка…
Ссылка в новой задаче