diff options
| author | Morris Jobke <hey@morrisjobke.de> | 2018-11-01 22:36:09 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-11-01 22:36:09 +0100 |
| commit | f28691c26edb5b6f01330946445316d25d175fcb (patch) | |
| tree | 77bc0b87e611677611750cd668be7e106a8b84a5 /core/js/sharedialogshareelistview.js | |
| parent | 35e3d40e803653e2fdfcd775eefc2d8a9a183d80 (diff) | |
| parent | 876d6ec8e6b1e38215659fd606b7d7022bdb8460 (diff) | |
| download | nextcloud-server-f28691c26edb5b6f01330946445316d25d175fcb.tar.gz nextcloud-server-f28691c26edb5b6f01330946445316d25d175fcb.zip | |
Merge pull request #11844 from nextcloud/multiple-link-shares
allow to create multiple link shares via share api
Diffstat (limited to 'core/js/sharedialogshareelistview.js')
| -rw-r--r-- | core/js/sharedialogshareelistview.js | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/core/js/sharedialogshareelistview.js b/core/js/sharedialogshareelistview.js index 94abf55a358..8b709f0d74d 100644 --- a/core/js/sharedialogshareelistview.js +++ b/core/js/sharedialogshareelistview.js @@ -134,6 +134,8 @@ var hasPassword = password !== null && password !== ''; var sendPasswordByTalk = share.send_password_by_talk; + var shareNote = this.model.getNote(shareIndex); + return _.extend(hasPermissionOverride, { cid: this.cid, hasSharePermission: this.model.hasSharePermission(shareIndex), @@ -159,7 +161,8 @@ isTalkEnabled: oc_appswebroots['spreed'] !== undefined, secureDropMode: !this.model.hasReadPermission(shareIndex), hasExpireDate: this.model.getExpireDate(shareIndex) !== null, - shareNote: this.model.getNote(shareIndex), + shareNote: shareNote, + hasNote: shareNote !== '', expireDate: moment(this.model.getExpireDate(shareIndex), 'YYYY-MM-DD').format('DD-MM-YYYY'), // The password placeholder does not take into account if // sending the password by Talk is enabled or not; when @@ -386,7 +389,7 @@ var $form = $menu.next('li.share-note-form'); // show elements - $menu.find('.share-note-delete').toggle(); + $menu.find('.share-note-delete').toggleClass('hidden'); $form.toggleClass('hidden'); $form.find('textarea').focus(); }, @@ -405,7 +408,7 @@ $form.find('.share-note').val(''); $form.addClass('hidden'); - $menu.find('.share-note-delete').hide(); + $menu.find('.share-note-delete').addClass('hidden'); self.sendNote('', shareId, $menu); }, |