diff --git a/frontend/src/modules/dashboard/components/organization/dashboard-organization-item.vue b/frontend/src/modules/dashboard/components/organization/dashboard-organization-item.vue index 334a055913..624eec8e4c 100644 --- a/frontend/src/modules/dashboard/components/organization/dashboard-organization-item.vue +++ b/frontend/src/modules/dashboard/components/organization/dashboard-organization-item.vue @@ -28,7 +28,7 @@
- {{ organization.displayName }} + {{ organization.displayName || organization.name }}
diff --git a/frontend/src/modules/member/components/form/member-form-organizations.vue b/frontend/src/modules/member/components/form/member-form-organizations.vue index ebecc677c2..d32ca0e281 100644 --- a/frontend/src/modules/member/components/form/member-form-organizations.vue +++ b/frontend/src/modules/member/components/form/member-form-organizations.vue @@ -145,7 +145,11 @@ const dateRange = reactive([]); const organizations = computed({ get() { - return props.modelValue.organizations; + return props.modelValue.organizations.map((o) => ({ + ...o, + displayName: o.displayName || o.name, + label: o.displayName || o.name, + })); }, set(v) { emit('update:modelValue', { diff --git a/frontend/src/modules/member/components/member-organizations.vue b/frontend/src/modules/member/components/member-organizations.vue index 9f1bb5e331..b7a43e39f3 100644 --- a/frontend/src/modules/member/components/member-organizations.vue +++ b/frontend/src/modules/member/components/member-organizations.vue @@ -18,7 +18,7 @@

- {{ activeOrganization.displayName || '-' }} + {{ activeOrganization.displayName || activeOrganization.name || '-' }}

@@ -85,7 +85,7 @@ class="w-3.5" /> {{ - activeOrganization.displayName || '-' + activeOrganization.displayName || activeOrganization.name || '-' }} diff --git a/frontend/src/modules/organization/components/view/organization-view-header.vue b/frontend/src/modules/organization/components/view/organization-view-header.vue index fea3d8d320..44a17dbae9 100644 --- a/frontend/src/modules/organization/components/view/organization-view-header.vue +++ b/frontend/src/modules/organization/components/view/organization-view-header.vue @@ -5,14 +5,14 @@
-
{{ organization.displayName }}
+
{{ organization.displayName || organization.name }}