mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #26058 from nextcloud/backport/25911/stable21 

[stable21] Only clear share password model when actually saved
This commit is contained in:
Vincent Petry 2021-03-11 15:15:40 +01:00 committed by GitHub
parent 1d0b210d00 ec443159af
commit 04dd7b234e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/files_sharing/js/dist/files_sharing_tab.js vendored
View File

File diff suppressed because one or more lines are too long

2
apps/files_sharing/js/dist/files_sharing_tab.js.map vendored
View File

File diff suppressed because one or more lines are too long

7
apps/files_sharing/src/mixins/SharesMixin.js
View File

@ -248,11 +248,14 @@ export default {
try { try {
await this.updateShare(this.share.id, properties) await this.updateShare(this.share.id, properties)
if (propertyNames.indexOf('password') >= 0) {
// reset password state after sync
this.$delete(this.share, 'newPassword')
}
// clear any previous errors // clear any previous errors
this.$delete(this.errors, propertyNames[0]) this.$delete(this.errors, propertyNames[0])
// reset password state after sync
this.$delete(this.share, 'newPassword')
} catch ({ message }) { } catch ({ message }) {
if (message && message !== '') { if (message && message !== '') {
this.onSyncError(propertyNames[0], message) this.onSyncError(propertyNames[0], message)