From cbfe5f3c1fc496f30957fff4eb9b489e0727d8da Mon Sep 17 00:00:00 2001
From: Timo Benk <benk@b1-systems.de>
Date: Fri, 14 Oct 2016 09:58:24 +0200
Subject: feature endorse password for share links
works like "enforce password protection", but let the
user optionally remove the password protection after the
password is set.
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
---
core/js/shareconfigmodel.js | 1 +
core/js/sharedialoglinkshareview.js | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
(limited to 'core')
diff --git a/core/js/shareconfigmodel.js b/core/js/shareconfigmodel.js
index 98388cbd508..f16d3d7b148 100644
--- a/core/js/shareconfigmodel.js
+++ b/core/js/shareconfigmodel.js
@@ -22,6 +22,7 @@
defaults: {
publicUploadEnabled: false,
enforcePasswordForPublicLink: oc_appconfig.core.enforcePasswordForPublicLink,
+ endorsePasswordForPublicLink: oc_appconfig.core.endorsePasswordForPublicLink,
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 d881b85f70f..942d392f081 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) {
+ if(this.configModel.get('enforcePasswordForPublicLink') === false && this.configModel.get('endorsePasswordForPublicLink') === false) {
$loading.removeClass('hidden');
// this will create it
this.model.saveLinkShare();
--
cgit v1.2.3