diff --git a/frontend/src/components/ListView.vue b/frontend/src/components/ListView.vue index 9ae8d23b..332db99d 100644 --- a/frontend/src/components/ListView.vue +++ b/frontend/src/components/ListView.vue @@ -67,16 +67,27 @@ :class="[column.size, column.align]" >
- +
- +
- {{ row[column.key] }} + {{ getValue(row[column.key]).label }}
@@ -153,4 +164,15 @@ const viewsDropdownOptions = [ }, }, ] + +function getValue(value) { + if (typeof value === 'object') { + value.label = value.full_name + value.image = value.user_image + return value + } + return { + label: value, + } +} diff --git a/frontend/src/pages/Contacts.vue b/frontend/src/pages/Contacts.vue index 82a6d624..eb62c091 100644 --- a/frontend/src/pages/Contacts.vue +++ b/frontend/src/pages/Contacts.vue @@ -22,7 +22,7 @@ contacts.fetch() const columns = [ { - label: 'Full Name', + label: 'Full name', key: 'full_name', type: 'user', size: 'w-44', diff --git a/frontend/src/pages/Leads.vue b/frontend/src/pages/Leads.vue index 749f900f..a3184a26 100644 --- a/frontend/src/pages/Leads.vue +++ b/frontend/src/pages/Leads.vue @@ -6,8 +6,10 @@ import ListView from '../components/ListView.vue' import { computed } from 'vue' import { createListResource } from 'frappe-ui' +import { usersStore } from '../stores/users' const title = 'Leads' +const { getUser } = usersStore() const leads = createListResource({ type: 'list', @@ -32,9 +34,8 @@ leads.fetch() const columns = [ { - label: 'Full name', + label: 'Name', key: 'full_name', - type: 'user', size: 'w-44', }, { @@ -77,7 +78,7 @@ const rows = computed(() => { status: lead.status, email: lead.email, mobile_no: lead.mobile_no, - lead_owner: lead.lead_owner, + lead_owner: getUser(lead.lead_owner), } }) })