diff options
| author | Kushal Pandya <kushalspandya@gmail.com> | 2019-01-18 06:48:24 +0000 |
|---|---|---|
| committer | Kushal Pandya <kushalspandya@gmail.com> | 2019-01-18 06:48:24 +0000 |
| commit | c01f673610804005988c3fbb0082886157cedc09 (patch) | |
| tree | b148a996e7173eec8a7ca53a656ab7537b371afe /app | |
| parent | f22e4a368b0eca538b384a73597f2bd5578a82f2 (diff) | |
| parent | 3420ec15dd929ccf28efe8262b9a625a7cc080ed (diff) | |
| download | gitlab-ce-c01f673610804005988c3fbb0082886157cedc09.tar.gz | |
Merge branch 'user-avatar-list-empty-text' into 'master'
Handle emptyText in user_avatar_list
See merge request gitlab-org/gitlab-ce!24436
Diffstat (limited to 'app')
| -rw-r--r-- | app/assets/javascripts/vue_shared/components/user_avatar/user_avatar_list.vue | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/app/assets/javascripts/vue_shared/components/user_avatar/user_avatar_list.vue b/app/assets/javascripts/vue_shared/components/user_avatar/user_avatar_list.vue index 7361867edc5..8eaf8386b99 100644 --- a/app/assets/javascripts/vue_shared/components/user_avatar/user_avatar_list.vue +++ b/app/assets/javascripts/vue_shared/components/user_avatar/user_avatar_list.vue @@ -23,6 +23,11 @@ export default { required: false, default: 20, }, + emptyText: { + type: String, + required: false, + default: __('None'), + }, }, data() { return { @@ -65,7 +70,8 @@ export default { </script> <template> - <div> + <div v-if="!items.length">{{ emptyText }}</div> + <div v-else> <user-avatar-link v-for="item in visibleItems" :key="item.id" |