endorseLinkPassword changed to enableLinkPasswordByDefault

Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>

diff --git a/core/js/shareconfigmodel.js b/core/js/shareconfigmodel.js
index f16d3d7b148740d815f281d99d268fe6ea27b5d8..1ead631db4d73576e834a49e6e9838a9295dcfb4 100644 (file)
--- 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 942d392f081d13173c51966bd4b9a6c9dedb9c8d..00b12ec1f99fab7ff83f5d56b5da4885914c494e 100644 (file)
--- 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();