diff options
| author | John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com> | 2018-07-20 11:22:24 +0200 |
|---|---|---|
| committer | John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com> | 2018-07-21 15:02:21 +0200 |
| commit | 58debbe42c16ee4ab7d36ffc91a53ae953c09021 (patch) | |
| tree | 1f2e0a7bc16ea5a3462a9f7d947444b01792e13f /core/js/sharedialogresharerinfoview.js | |
| parent | e302cadae27ed560960b2b87810023ec4827aa4d (diff) | |
| download | nextcloud-server-58debbe42c16ee4ab7d36ffc91a53ae953c09021.tar.gz nextcloud-server-58debbe42c16ee4ab7d36ffc91a53ae953c09021.zip | |
Tests fixes and design bump
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
Diffstat (limited to 'core/js/sharedialogresharerinfoview.js')
| -rw-r--r-- | core/js/sharedialogresharerinfoview.js | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/core/js/sharedialogresharerinfoview.js b/core/js/sharedialogresharerinfoview.js index f4bf9afa0b2..fadd0a41f7b 100644 --- a/core/js/sharedialogresharerinfoview.js +++ b/core/js/sharedialogresharerinfoview.js @@ -19,7 +19,8 @@ '<span class="reshare">' + ' <div class="avatar" data-userName="{{reshareOwner}}"></div>' + ' {{sharedByText}}' + - '</span><br/>' + '</span>' + + '{{#if hasShareNote}}<div class="share-note">{{shareNote}}</div>{{/if}}' ; /** @@ -72,7 +73,10 @@ var reshareTemplate = this.template(); var ownerDisplayName = this.model.getReshareOwnerDisplayname(); + var shareNote = this.model.getReshareNote(); + var sharedByText = ''; + if (this.model.getReshareType() === OC.Share.SHARE_TYPE_GROUP) { sharedByText = t( 'core', @@ -105,9 +109,13 @@ ); } + + this.$el.html(reshareTemplate({ reshareOwner: this.model.getReshareOwner(), - sharedByText: sharedByText + sharedByText: sharedByText, + shareNote: shareNote, + hasShareNote: shareNote !== '' })); this.$el.find('.avatar').each(function() { |