diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-09-20 21:13:03 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-09-20 21:13:03 +0300 |
| commit | 29f6c0bff81cae77435342e46d1f439ac16a57d1 (patch) | |
| tree | 9e48603e2818e9c56ac937743fd23f1d0fcf6529 /app/assets/javascripts/crm | |
| parent | b962adf4c32f2371ad0d8bfcdc444933943d3cd9 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/crm')
| -rw-r--r-- | app/assets/javascripts/crm/contacts/components/contacts_root.vue | 11 | ||||
| -rw-r--r-- | app/assets/javascripts/crm/organizations/components/organizations_root.vue | 9 |
2 files changed, 7 insertions, 13 deletions
diff --git a/app/assets/javascripts/crm/contacts/components/contacts_root.vue b/app/assets/javascripts/crm/contacts/components/contacts_root.vue index 562363ff88e..2be17d1f80f 100644 --- a/app/assets/javascripts/crm/contacts/components/contacts_root.vue +++ b/app/assets/javascripts/crm/contacts/components/contacts_root.vue @@ -86,7 +86,7 @@ export default { }, methods: { errorAlertDismissed() { - this.error = true; + this.error = false; }, extractContacts(data) { const contacts = data?.group?.contacts?.nodes || []; @@ -146,7 +146,7 @@ export default { editButtonLabel: __('Edit'), title: s__('Crm|Customer relations contacts'), newContact: s__('Crm|New contact'), - errorText: __('Something went wrong. Please try again.'), + errorMsg: __('Something went wrong. Please try again.'), }, EDIT_ROUTE_NAME, NEW_ROUTE_NAME, @@ -176,7 +176,7 @@ export default { <div> <paginated-table-with-search-and-tabs :show-items="true" - :show-error-msg="false" + :show-error-msg="error" :i18n="$options.i18n" :items="contacts.list" :page-info="contacts.pageInfo" @@ -243,10 +243,7 @@ export default { </template> <template #empty> - <span v-if="error"> - {{ $options.i18n.errorText }} - </span> - <span v-else> + <span> {{ $options.i18n.emptyText }} </span> </template> diff --git a/app/assets/javascripts/crm/organizations/components/organizations_root.vue b/app/assets/javascripts/crm/organizations/components/organizations_root.vue index 155c8f00537..28f0b34f031 100644 --- a/app/assets/javascripts/crm/organizations/components/organizations_root.vue +++ b/app/assets/javascripts/crm/organizations/components/organizations_root.vue @@ -137,7 +137,7 @@ export default { editButtonLabel: __('Edit'), title: s__('Crm|Customer relations organizations'), newOrganization: s__('Crm|New organization'), - errorText: __('Something went wrong. Please try again.'), + errorMsg: __('Something went wrong. Please try again.'), }, EDIT_ROUTE_NAME, NEW_ROUTE_NAME, @@ -167,7 +167,7 @@ export default { <div> <paginated-table-with-search-and-tabs :show-items="true" - :show-error-msg="false" + :show-error-msg="error" :i18n="$options.i18n" :items="organizations.list" :page-info="organizations.pageInfo" @@ -238,10 +238,7 @@ export default { </template> <template #empty> - <span v-if="error"> - {{ $options.i18n.errorText }} - </span> - <span v-else> + <span> {{ $options.i18n.emptyText }} </span> </template> |