From ab684934ea891348329e9312c2220a4911736df0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Calvi=C3=B1o=20S=C3=A1nchez?= <danxuliu@gmail.com>
Date: Wed, 30 Jan 2019 00:07:31 +0100
Subject: [PATCH 1/3] Remove unused parameter
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
---
 core/js/sharedialoglinkshareview.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/core/js/sharedialoglinkshareview.js b/core/js/sharedialoglinkshareview.js
index 4d513bcee0100..62b79c5aecef4 100644
--- a/core/js/sharedialoglinkshareview.js
+++ b/core/js/sharedialoglinkshareview.js
@@ -644,7 +644,6 @@
 				passwordLabel: t('core', 'Password'),
 				passwordPlaceholder: isPasswordSet ? PASSWORD_PLACEHOLDER : PASSWORD_PLACEHOLDER_MESSAGE,
 				passwordPlaceholderInitial: passwordPlaceholderInitial,
-				showPasswordCheckBox: showPasswordCheckBox,
 				isPasswordEnforced: isPasswordEnforced,
 			});
 

From 355edcee74cc304ee124c6f68684007f5cc6ebe4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Calvi=C3=B1o=20S=C3=A1nchez?= <danxuliu@gmail.com>
Date: Wed, 30 Jan 2019 00:10:03 +0100
Subject: [PATCH 2/3] Fix updating the password of a link share when passwords
 are enforced
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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 popover menu
is shown only when the share is a link share, and 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>
---
 core/js/sharedialoglinkshareview.js | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/core/js/sharedialoglinkshareview.js b/core/js/sharedialoglinkshareview.js
index 62b79c5aecef4..801f245f6e876 100644
--- a/core/js/sharedialoglinkshareview.js
+++ b/core/js/sharedialoglinkshareview.js
@@ -85,7 +85,6 @@
 				'		<label for="sharingDialogAllowPublicEditing-{{cid}}">{{publicEditingLabel}}</label>' +
 				'	</span></li>' +
 				'{{/if}}' +
-				'{{#if showPasswordCheckBox}}' +
 				'	<li><span class="shareOption menuitem">' +
 				'		<input type="checkbox" name="showPassword" id="showPassword-{{cid}}" class="checkbox showPasswordCheckbox"' +
 				'			{{#if isPasswordSet}}checked="checked"{{/if}} {{#if isPasswordEnforced}}disabled="disabled"{{/if}} value="1" />' +
@@ -96,7 +95,6 @@
 				'    <input type="submit" class="icon-confirm share-pass-submit" value="" />' +
 				'    <span class="icon icon-loading-small hidden"></span>' +
 				'	</span></li>' +
-				'{{/if}}' +
 				'<li>' +
 				'	<span class="shareOption menuitem">' +
 				'		<input id="expireDate-{{cid}}" type="checkbox" name="expirationDate" class="expireDate checkbox"' +
@@ -536,9 +534,6 @@
 			var isPasswordSet = !!this.model.get('linkShare').password;
 			var isPasswordEnforced = this.configModel.get('enforcePasswordForPublicLink')
 			var isPasswordEnabledByDefault = this.configModel.get('enableLinkPasswordByDefault') === true
-			var showPasswordCheckBox = isLinkShare
-				&& (   !this.configModel.get('enforcePasswordForPublicLink')
-					|| !this.model.get('linkShare').password);
 			var passwordPlaceholderInitial = this.configModel.get('enforcePasswordForPublicLink')
 				? PASSWORD_PLACEHOLDER_MESSAGE : PASSWORD_PLACEHOLDER_MESSAGE_OPTIONAL;
 
@@ -610,7 +605,6 @@
 				passwordPlaceholder: isPasswordSet ? PASSWORD_PLACEHOLDER : PASSWORD_PLACEHOLDER_MESSAGE,
 				passwordPlaceholderInitial: passwordPlaceholderInitial,
 				isPasswordSet: isPasswordSet || isPasswordEnabledByDefault || isPasswordEnforced,
-				showPasswordCheckBox: showPasswordCheckBox,
 				publicUpload: publicUpload && isLinkShare,
 				publicEditing: publicEditable,
 				publicEditingChecked: publicEditingChecked,

From a94fa97350056b600f3d06cd6e500a0ce2ab12d6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Calvi=C3=B1o=20S=C3=A1nchez?= <danxuliu@gmail.com>
Date: Wed, 30 Jan 2019 00:16:50 +0100
Subject: [PATCH 3/3] Fix template format
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
---
 core/js/sharedialoglinkshareview.js | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/core/js/sharedialoglinkshareview.js b/core/js/sharedialoglinkshareview.js
index 801f245f6e876..bb1dcf2b2bd2b 100644
--- a/core/js/sharedialoglinkshareview.js
+++ b/core/js/sharedialoglinkshareview.js
@@ -85,16 +85,20 @@
 				'		<label for="sharingDialogAllowPublicEditing-{{cid}}">{{publicEditingLabel}}</label>' +
 				'	</span></li>' +
 				'{{/if}}' +
-				'	<li><span class="shareOption menuitem">' +
+				'<li>' +
+				'	<span class="shareOption menuitem">' +
 				'		<input type="checkbox" name="showPassword" id="showPassword-{{cid}}" class="checkbox showPasswordCheckbox"' +
 				'			{{#if isPasswordSet}}checked="checked"{{/if}} {{#if isPasswordEnforced}}disabled="disabled"{{/if}} value="1" />' +
 				'		<label for="showPassword-{{cid}}">{{enablePasswordLabel}}</label>' +
-				'	</span></li>' +
-				'	<li class="{{#unless isPasswordSet}}hidden{{/unless}} linkPassMenu"><span class="shareOption menuitem icon-share-pass">' +
-				'    	<input id="linkPassText-{{cid}}" class="linkPassText" type="password" placeholder="{{passwordPlaceholder}}" autocomplete="new-password" />' +
-				'    <input type="submit" class="icon-confirm share-pass-submit" value="" />' +
-				'    <span class="icon icon-loading-small hidden"></span>' +
-				'	</span></li>' +
+				'	</span>' +
+				'</li>' +
+				'<li class="{{#unless isPasswordSet}}hidden{{/unless}} linkPassMenu">' +
+				'	<span class="shareOption menuitem icon-share-pass">' +
+				'		<input id="linkPassText-{{cid}}" class="linkPassText" type="password" placeholder="{{passwordPlaceholder}}" autocomplete="new-password" />' +
+				'		<input type="submit" class="icon-confirm share-pass-submit" value="" />' +
+				'		<span class="icon icon-loading-small hidden"></span>' +
+				'	</span>' +
+				'</li>' +
 				'<li>' +
 				'	<span class="shareOption menuitem">' +
 				'		<input id="expireDate-{{cid}}" type="checkbox" name="expirationDate" class="expireDate checkbox"' +