diff options
author | kushalpandya <kushal@gitlab.com> | 2017-08-01 14:38:40 +0530 |
---|---|---|
committer | kushalpandya <kushal@gitlab.com> | 2017-08-01 14:38:40 +0530 |
commit | 00226a9404d8e453a06d09ec54628a4eb66d98ec (patch) | |
tree | dfc4b1a7123453abc81f40bbd4d376da06704d1e | |
parent | 59377d54e91ba9acb309fe3cb1d4f942dbf43e54 (diff) | |
download | gitlab-ce-00226a9404d8e453a06d09ec54628a4eb66d98ec.tar.gz |
Import `group_identicon` minor clean up and prop updates
-rw-r--r-- | app/assets/javascripts/groups/components/group_item.vue | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/app/assets/javascripts/groups/components/group_item.vue b/app/assets/javascripts/groups/components/group_item.vue index c704aa65df2..41c9e5fc8b0 100644 --- a/app/assets/javascripts/groups/components/group_item.vue +++ b/app/assets/javascripts/groups/components/group_item.vue @@ -1,7 +1,11 @@ <script> import eventHub from '../event_hub'; +import groupIdenticon from './group_identicon.vue'; export default { + components: { + groupIdenticon, + }, props: { group: { type: Object, @@ -93,11 +97,7 @@ export default { return Object.keys(this.group.subGroups).length > 0; }, hasAvatar() { - if (this.group.avatarUrl) { - return this.group.avatarUrl.indexOf('/assets/no_group_avatar') === -1; - } else { - return false; - } + return this.group.avatarUrl && this.group.avatarUrl.indexOf('/assets/no_group_avatar') === -1; }, }, }; @@ -207,8 +207,8 @@ export default { /> <group-identicon v-else - :id=group.id - :name="group.name" + :entityId=group.id + :entityName="group.name" /> </a> </div> |