Fix password enforce on public share links

Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>

diff --git a/core/js/share/sharedialoglinkshareview.handlebars b/core/js/share/sharedialoglinkshareview.handlebars
index 64f527042903bdc06c13dd3a1eaab58d6161beae..4f58f632d1b6ad0f44f546ccf7cf7890ecfb53da 100644 (file)
--- a/core/js/share/sharedialoglinkshareview.handlebars
+++ b/core/js/share/sharedialoglinkshareview.handlebars
@@ -1,7 +1,7 @@
 {{#if shareAllowed}}
 <ul class="shareWithList">
        {{#if nolinkShares}}
-               <li data-share-id="new-share">
+               <li data-share-id="{{newShareId}}">
                        <div class="avatar icon-public-white"></div>
                        <span class="username">{{newShareLabel}}</span>
                        <span class="sharingOptionsGroup">

diff --git a/core/js/sharedialoglinkshareview.js b/core/js/sharedialoglinkshareview.js
index e5af4ad1f177c732a370407f9a44c5c6cd1173e2..5dc7d7067207223685d3c328ec6d40de779f3ab9 100644 (file)
--- a/core/js/sharedialoglinkshareview.js
+++ b/core/js/sharedialoglinkshareview.js
@@ -45,6 +45,9 @@
                /** @type {string} **/
                password: '',
 
+               /** @type {string} **/
+               newShareId: 'new-share',
+
                events: {
                        // open menu
                        'click .share-menu .icon-more': 'onToggleMenu',
@@ -650,7 +653,8 @@
                                newShareLabel: t('core', 'Share link'),
                                newShareTitle: t('core', 'New share link'),
                                pendingPopoverMenu: pendingPopoverMenu,
-                               showPending: this.showPending === 'new',
+                               showPending: this.showPending === this.newShareId,
+                               newShareId: this.newShareId,
                        }));
 
                        this.delegateEvents();

diff --git a/core/js/sharetemplates.js b/core/js/sharetemplates.js
index 0f1762c5f056181e0e2661295cd7273ec0de8b4b..619215d8083c31851c8c0c7531f1226a472157f9 100644 (file)
--- a/core/js/sharetemplates.js
+++ b/core/js/sharetemplates.js
@@ -10,7 +10,9 @@ templates['sharedialoglinkshareview'] = template({"1":function(container,depth0,
 },"2":function(container,depth0,helpers,partials,data) {
     var stack1, helper, alias1=depth0 != null ? depth0 : (container.nullContext || {}), alias2=helpers.helperMissing, alias3="function", alias4=container.escapeExpression;
 
-  return "             <li data-share-id=\"new-share\">\n                      <div class=\"avatar icon-public-white\"></div>\n                        <span class=\"username\">"
+  return "             <li data-share-id=\""
+    + alias4(((helper = (helper = helpers.newShareId || (depth0 != null ? depth0.newShareId : depth0)) != null ? helper : alias2),(typeof helper === alias3 ? helper.call(alias1,{"name":"newShareId","hash":{},"data":data}) : helper)))
+    + "\">\n                   <div class=\"avatar icon-public-white\"></div>\n                        <span class=\"username\">"
     + alias4(((helper = (helper = helpers.newShareLabel || (depth0 != null ? depth0.newShareLabel : depth0)) != null ? helper : alias2),(typeof helper === alias3 ? helper.call(alias1,{"name":"newShareLabel","hash":{},"data":data}) : helper)))
     + "</span>\n                       <span class=\"sharingOptionsGroup\">\n                          <div class=\"share-menu\">\n                                    <a href=\"#\" class=\"icon icon-add new-share has-tooltip "
     + ((stack1 = helpers["if"].call(alias1,(depth0 != null ? depth0.showPending : depth0),{"name":"if","hash":{},"fn":container.program(3, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "")