test/jcrm
1
0
Fork 0
forked from test/crm
Code Pull Requests Activity

fix: show user name and avatar instead of email in timeline changes

Browse Source
This commit is contained in:
Shariq Ansari 2023-09-27 19:26:56 +05:30
parent 045d2dc358
commit 424d8feab2
2 changed files with 25 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
crm/fcrm/doctype/crm_lead/api.py
View File

@ -46,8 +46,11 @@ def get_activities(name):
data = json.loads(version.data)
if not data.get("changed"):
continue
field_option = None
if change := data.get("changed")[0]:
field_label = next((f.label for f in lead_fields_meta if f.fieldname == change[0]), None)
field_label, field_option = next(((f.label, f.options) for f in lead_fields_meta if f.fieldname == change[0]), None)
activity_type = "changed"
if field_label == "Lead Owner" and (created_as_deal or not is_lead):
field_label = "Deal Owner"
@ -83,6 +86,7 @@ def get_activities(name):
"owner": version.owner,
"data": data,
"is_lead": is_lead,
"options": field_option,
}
activities.append(activity)

22
frontend/src/components/Activities.vue
View File

@ -331,14 +331,32 @@
v-if="activity.data.old_value"
class="max-w-xs truncate font-medium text-gray-800"
>
{{ activity.data.old_value }}
<div
class="flex items-center gap-1"
v-if="activity.options == 'User'"
>
<UserAvatar :user="activity.data.old_value" size="xs" />
{{ getUser(activity.data.old_value).full_name }}
</div>
<div v-else>
{{ activity.data.old_value }}
</div>
</span>
<span v-if="activity.to">to</span>
<span
v-if="activity.data.value"
class="max-w-xs truncate font-medium text-gray-800"
>
{{ activity.data.value }}
<div
class="flex items-center gap-1"
v-if="activity.options == 'User'"
>
<UserAvatar :user="activity.data.value" size="xs" />
{{ getUser(activity.data.value).full_name }}
</div>
<div v-else>
{{ activity.data.value }}
</div>
</span>
</div>