Skip to content

[stable27] Show pending popover menu when password is enabled by default #38395

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
blizzz merged 3 commits into from
Jul 13, 2023
Merged

[stable27] Show pending popover menu when password is enabled by default #38395

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
024141d
Rename "pendingPassword" to "pendingEnforcedPassword"
danxuliu May 9, 2023
03095bb
Show pending popover menu when password is enabled by default
danxuliu May 9, 2023
8ccff9c
chore(assets): Recompile assets
nextcloud-command Jul 13, 2023
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
Prev Previous commit
Next Next commit
Show pending popover menu when password is enabled by default 
When "Enforce password protection" is enabled in the sharing settings a
popover menu is shown to set a password before the share is created. On
the other hand, when "Always ask for a password" was enabled in the
sharing settings and a new link share was created the share was
immediately created with a default password; the user was not able to
specify a password (nor create the share without password).

The component template already provided the needed elements to also ask
for the password without enforcing it, but the popover menu was not
shown due to "enableLinkPasswordByDefault" being missing in "if"
conditions.

Signed-off-by: Daniel Calviño Sánchez <[email protected]>
  • Loading branch information
@danxuliu
danxuliu committed Jul 13, 2023
commit 03095bb928c4f84c73526ed3930df83206d5176d
16 changes: 8 additions & 8 deletions apps/files_sharing/src/components/SharingEntryLink.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
</NcActions>

<!-- pending actions -->
<NcActions v-if="!pending && (pendingEnforcedPassword || pendingExpirationDate)"
<NcActions v-if="!pending && (pendingPassword || pendingEnforcedPassword || pendingExpirationDate)"
class="sharing-entry__actions"
:aria-label="actionsTooltip"
menu-align="right"
Expand All @@ -67,7 +67,7 @@
<NcActionText v-if="pendingEnforcedPassword" icon="icon-password">
{{ t('files_sharing', 'Password protection (enforced)') }}
</NcActionText>
<NcActionCheckbox v-else-if="config.enableLinkPasswordByDefault"
<NcActionCheckbox v-else-if="pendingPassword"
:checked.sync="isPasswordProtected"
:disabled="config.enforcePasswordForPublicLink || saving"
class="share-link-password-checkbox"
Expand Down Expand Up @@ -516,6 +516,9 @@ export default {
*
* @return {boolean}
*/
pendingPassword() {
return this.config.enableLinkPasswordByDefault && this.share && !this.share.id
},
pendingEnforcedPassword() {
return this.config.enforcePasswordForPublicLink && this.share && !this.share.id
},
Expand Down Expand Up @@ -613,12 +616,9 @@ export default {
// expiration is the share object key, not expireDate
shareDefaults.expiration = this.formatDateToString(this.config.defaultExpirationDate)
}
if (this.config.enableLinkPasswordByDefault) {
shareDefaults.password = await GeneratePassword()
}

// do not push yet if we need a password or an expiration date: show pending menu
if (this.config.enforcePasswordForPublicLink || this.config.isDefaultExpireDateEnforced) {
if (this.config.enableLinkPasswordByDefault || this.config.enforcePasswordForPublicLink || this.config.isDefaultExpireDateEnforced) {
this.pending = true

// if a share already exists, pushing it
Expand All @@ -641,8 +641,8 @@ export default {
}

// ELSE, show the pending popovermenu
// if password enforced, pre-fill with random one
if (this.config.enforcePasswordForPublicLink) {
// if password default or enforced, pre-fill with random one
if (this.config.enableLinkPasswordByDefault || this.config.enforcePasswordForPublicLink) {
shareDefaults.password = await GeneratePassword()
}

Expand Down