Skip to content

[stable19] Only clear share password model when actually saved #26060

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ChristophWurst merged 1 commit into from
Mar 15, 2021
Merged

[stable19] Only clear share password model when actually saved #26060

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Only clear share password model when actually saved 
Instead of always clearing the password in the share model, now only do
it when it was actually saved.

Fixes an issue where saving another field would clear the password too
early and prevent it to be saved when the dropdown closed.

Signed-off-by: Vincent Petry <[email protected]>
Signed-off-by: npmbuildbot-nextcloud[bot] <npmbuildbot-nextcloud[bot]@users.noreply.github.com>
  • Loading branch information
@PVince81
PVince81 committed Mar 12, 2021
commit 20c16e21c234c0efddbe297eb69f7fbea12a86bb
2 changes: 1 addition & 1 deletion apps/files_sharing/js/dist/files_sharing_tab.js
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion apps/files_sharing/js/dist/files_sharing_tab.js.map
View file
Open in desktop

Large diffs are not rendered by default.

7 changes: 5 additions & 2 deletions apps/files_sharing/src/mixins/SharesMixin.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -248,11 +248,14 @@ export default {
try {
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
this.$delete(this.errors, propertyNames[0])

// reset password state after sync
this.$delete(this.share, 'newPassword')
} catch ({ message }) {
if (message && message !== '') {
this.onSyncError(propertyNames[0], message)
Expand Down