Skip to content

Commit

Permalink
show token string if link name is empty in FileLinkSidebar
Browse files Browse the repository at this point in the history
  • Loading branch information
karakayasemi committed Apr 23, 2020
1 parent d366363 commit 042b963
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 2 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
target="_blank"
:uk-tooltip="$_tooltipTextLink"
class="uk-text-bold uk-text-truncate oc-files-file-link-url"
>{{ link.name }}</a
>{{ $_linkNameText }}</a
>
<br />
<span class="uk-text-meta uk-text-break">
Expand Down Expand Up @@ -129,6 +129,9 @@ export default {
}
},
computed: {
$_linkNameText() {
return this.link.name ? this.link.name : this.link.token
},
$_loadingSpinnerVisible() {
return this.modifiable && this.removalInProgress
},
Expand Down
2 changes: 1 addition & 1 deletion apps/files/src/store/actions.js
Original file line number Diff line number Diff line change
Expand Up @@ -258,7 +258,7 @@ function _buildLink(link, $gettext) {
permissions: link.permissions,
description,
stime: link.stime,
name: link.name,
name: typeof link.name === 'string' ? link.name : '',
password: !!(link.share_with && link.share_with_displayname),
expiration:
typeof link.expiration === 'string' ? moment(link.expiration).format('YYYY-MM-DD') : null,
Expand Down

0 comments on commit 042b963

Please sign in to comment.