Skip to content

Commit

Permalink
Fix password enforce on public share links
Browse files Browse the repository at this point in the history
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
  • Loading branch information
skjnldsv committed Nov 5, 2018
1 parent 934d08b commit 11b6c22
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 3 deletions.
2 changes: 1 addition & 1 deletion core/js/share/sharedialoglinkshareview.handlebars
Original file line number Diff line number Diff line change
@@ -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">
Expand Down
6 changes: 5 additions & 1 deletion core/js/sharedialoglinkshareview.js
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,9 @@
/** @type {string} **/
password: '',

/** @type {string} **/
newShareId: 'new-share',

events: {
// open menu
'click .share-menu .icon-more': 'onToggleMenu',
Expand Down Expand Up @@ -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();
Expand Down
4 changes: 3 additions & 1 deletion core/js/sharetemplates.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 11b6c22

Please sign in to comment.