mirror of
https://github.com/nextcloud/server.git
synced 2026-04-28 17:48:40 -04:00
Merge pull request #35578 from nextcloud/backport/35271/stable25
This commit is contained in:
commit
36e217a040
4 changed files with 12 additions and 4 deletions
|
|
@ -299,7 +299,7 @@
|
|||
|
||||
<script>
|
||||
import { generateUrl } from '@nextcloud/router'
|
||||
import { showError } from '@nextcloud/dialogs'
|
||||
import { showError, showSuccess } from '@nextcloud/dialogs'
|
||||
import { Type as ShareTypes } from '@nextcloud/sharing'
|
||||
import Vue from 'vue'
|
||||
|
||||
|
|
@ -766,6 +766,7 @@ export default {
|
|||
if (typeof this.share.newLabel === 'string') {
|
||||
this.share.label = this.share.newLabel
|
||||
this.$delete(this.share, 'newLabel')
|
||||
showSuccess(t('files_sharing', 'Share label saved'))
|
||||
this.queueUpdate('label')
|
||||
}
|
||||
},
|
||||
|
|
@ -832,6 +833,7 @@ export default {
|
|||
onPasswordSubmit() {
|
||||
if (this.hasUnsavedPassword) {
|
||||
this.share.password = this.share.newPassword.trim()
|
||||
showSuccess(t('files_sharing', 'Share password saved'))
|
||||
this.queueUpdate('password')
|
||||
}
|
||||
},
|
||||
|
|
|
|||
|
|
@ -25,6 +25,7 @@
|
|||
*
|
||||
*/
|
||||
|
||||
import { showSuccess } from '@nextcloud/dialogs'
|
||||
import { getCurrentUser } from '@nextcloud/auth'
|
||||
// eslint-disable-next-line import/no-unresolved, node/no-missing-import
|
||||
import PQueue from 'p-queue'
|
||||
|
|
@ -211,6 +212,7 @@ export default {
|
|||
if (this.share.newNote) {
|
||||
this.share.note = this.share.newNote
|
||||
this.$delete(this.share, 'newNote')
|
||||
showSuccess(t('files_sharing', 'Share note saved'))
|
||||
this.queueUpdate('note')
|
||||
}
|
||||
},
|
||||
|
|
@ -224,6 +226,10 @@ export default {
|
|||
this.open = false
|
||||
await this.deleteShare(this.share.id)
|
||||
console.debug('Share deleted', this.share.id)
|
||||
const message = this.share.itemType === 'file'
|
||||
? t('files_sharing', 'File "{path}" has been unshared', { path: this.share.path })
|
||||
: t('files_sharing', 'Folder "{path}" has been unshared', { path: this.share.path })
|
||||
showSuccess(message)
|
||||
this.$emit('remove:share', this.share)
|
||||
} catch (error) {
|
||||
// re-open menu if error
|
||||
|
|
|
|||
4
dist/files_sharing-files_sharing_tab.js
vendored
4
dist/files_sharing-files_sharing_tab.js
vendored
File diff suppressed because one or more lines are too long
2
dist/files_sharing-files_sharing_tab.js.map
vendored
2
dist/files_sharing-files_sharing_tab.js.map
vendored
File diff suppressed because one or more lines are too long
Loading…
Reference in a new issue