aboutsummaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorTimo Benk <benk@b1-systems.de>2016-10-17 09:11:30 +0200
committerBjoern Schiessle <bjoern@schiessle.org>2017-04-03 10:58:11 +0200
commit0d7801b6ce04f3f60d9aa98afef4a019a4479193 (patch)
treedc7ef78c4e8e926c60fefcf72a41b822321e0697 /core
parentcbfe5f3c1fc496f30957fff4eb9b489e0727d8da (diff)
downloadnextcloud-server-0d7801b6ce04f3f60d9aa98afef4a019a4479193.tar.gz
nextcloud-server-0d7801b6ce04f3f60d9aa98afef4a019a4479193.zip
endorseLinkPassword changed to enableLinkPasswordByDefault
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
Diffstat (limited to 'core')
-rw-r--r--core/js/shareconfigmodel.js2
-rw-r--r--core/js/sharedialoglinkshareview.js2
2 files changed, 2 insertions, 2 deletions
diff --git a/core/js/shareconfigmodel.js b/core/js/shareconfigmodel.js
index f16d3d7b148..1ead631db4d 100644
--- a/core/js/shareconfigmodel.js
+++ b/core/js/shareconfigmodel.js
@@ -22,7 +22,7 @@
defaults: {
publicUploadEnabled: false,
enforcePasswordForPublicLink: oc_appconfig.core.enforcePasswordForPublicLink,
- endorsePasswordForPublicLink: oc_appconfig.core.endorsePasswordForPublicLink,
+ enableLinkPasswordByDefault: oc_appconfig.core.enableLinkPasswordByDefault,
isDefaultExpireDateEnforced: oc_appconfig.core.defaultExpireDateEnforced === true,
isDefaultExpireDateEnabled: oc_appconfig.core.defaultExpireDateEnabled === true,
isRemoteShareAllowed: oc_appconfig.core.remoteShareAllowed,
diff --git a/core/js/sharedialoglinkshareview.js b/core/js/sharedialoglinkshareview.js
index 942d392f081..00b12ec1f99 100644
--- a/core/js/sharedialoglinkshareview.js
+++ b/core/js/sharedialoglinkshareview.js
@@ -228,7 +228,7 @@
}
if($checkBox.is(':checked')) {
- if(this.configModel.get('enforcePasswordForPublicLink') === false && this.configModel.get('endorsePasswordForPublicLink') === false) {
+ if(this.configModel.get('enforcePasswordForPublicLink') === false && this.configModel.get('enableLinkPasswordByDefault') === false) {
$loading.removeClass('hidden');
// this will create it
this.model.saveLinkShare();