diff options
author | Daniel Calviño Sánchez <danxuliu@gmail.com> | 2019-01-29 20:26:22 +0100 |
---|---|---|
committer | Daniel Calviño Sánchez <danxuliu@gmail.com> | 2019-01-29 20:26:22 +0100 |
commit | 2c151f4efbe1f0945096634f72e7437ed289a75d (patch) | |
tree | 0713c4959d129b9370c5e7eb1daf93df72c0a3da /core/js/sharedialoglinkshareview.js | |
parent | 050b9135d50f57c777c157bb7aa8c102524b2c77 (diff) | |
download | nextcloud-server-2c151f4efbe1f0945096634f72e7437ed289a75d.tar.gz nextcloud-server-2c151f4efbe1f0945096634f72e7437ed289a75d.zip |
Fix updating the password of a link share when passwords are enforced
The password input was shown in the popup menu when passwords were not
enforced, or when they were enforced but no password was set, which
prevented updating/changing the password once set. As the password input
should be shown too when password are enforced and a password is set no
condition is needed, so now the password input is always shown.
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
Diffstat (limited to 'core/js/sharedialoglinkshareview.js')
-rw-r--r-- | core/js/sharedialoglinkshareview.js | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/core/js/sharedialoglinkshareview.js b/core/js/sharedialoglinkshareview.js index a3d25684631..ff5616f69b6 100644 --- a/core/js/sharedialoglinkshareview.js +++ b/core/js/sharedialoglinkshareview.js @@ -854,7 +854,6 @@ var isPasswordSet = !!share.password; var isPasswordEnabledByDefault = this.configModel.get('enableLinkPasswordByDefault') === true; var isPasswordEnforced = this.configModel.get('enforcePasswordForPublicLink'); - var showPasswordCheckBox = !isPasswordEnforced || !share.password; var isExpirationEnforced = this.configModel.get('isDefaultExpireDateEnforced'); var defaultExpireDays = this.configModel.get('defaultExpireDate'); var hasExpireDate = !!share.expiration || isExpirationEnforced; @@ -891,7 +890,6 @@ shareLinkURL: share.url, passwordPlaceholder: isPasswordSet ? PASSWORD_PLACEHOLDER : PASSWORD_PLACEHOLDER_MESSAGE, isPasswordSet: isPasswordSet || isPasswordEnabledByDefault || isPasswordEnforced, - showPasswordCheckBox: showPasswordCheckBox, showPasswordByTalkCheckBox: isTalkEnabled && isPasswordSet, passwordByTalkLabel: t('core', 'Password protect by Talk'), isPasswordByTalkSet: sendPasswordByTalk, |