Skip to content
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

[stable18] Only copy the link when updating a share or no password was forced #22338

Merged
merged 1 commit into from
Aug 21, 2020
Merged

[stable18] Only copy the link when updating a share or no password was forced #22338

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
6 changes: 3 additions & 3 deletions 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.

6 changes: 5 additions & 1 deletion apps/files_sharing/src/components/SharingEntryLink.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -681,7 +681,11 @@ export default {
// Execute the copy link method
// freshly created share component
// ! somehow does not works on firefox !
component.copyLink()
if (update || !this.config.enforcePasswordForPublicLink) {
// Only copy the link when the password was not forced,
// otherwise the user needs to copy/paste the password before finishing the share.
component.copyLink()
}

} catch ({ response }) {
const message = response.data.ocs.meta.message
Expand Down