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

fix: show field label instead of fieldname

Browse Source
This commit is contained in:
Shariq Ansari 2023-08-04 15:10:32 +05:30
parent aadcec3897
commit 0096a43465
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -28,6 +28,8 @@ def get_lead(name):
return { **lead, 'activities': activities } return { **lead, 'activities': activities }
def get_activities(doc, docinfo): def get_activities(doc, docinfo):
lead_fields_meta = frappe.get_meta("CRM Lead").fields
activities = [{ activities = [{
"activity_type": "creation", "activity_type": "creation",
"creation": doc.creation, "creation": doc.creation,
@ -39,8 +41,10 @@ def get_activities(doc, docinfo):
data = json.loads(version.data) data = json.loads(version.data)
if change := data.get("changed")[0]: if change := data.get("changed")[0]:
activity_type = "changed" activity_type = "changed"
field_label = next((f.label for f in lead_fields_meta if f.fieldname == change[0]), None)
data = { data = {
"field": change[0], "field": change[0],
"field_label": field_label,
"old_value": change[1], "old_value": change[1],
"value": change[2], "value": change[2],
} }
@ -50,12 +54,14 @@ def get_activities(doc, docinfo):
activity_type = "added" activity_type = "added"
data = { data = {
"field": change[0], "field": change[0],
"field_label": field_label,
"value": change[2], "value": change[2],
} }
elif change[1] and not change[2]: elif change[1] and not change[2]:
activity_type = "removed" activity_type = "removed"
data = { data = {
"field": change[0], "field": change[0],
"field_label": field_label,
"value": change[1], "value": change[1],
} }

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

@ -31,10 +31,10 @@
<span class="text-gray-900">{{ activity.owner_name }}</span> <span class="text-gray-900">{{ activity.owner_name }}</span>
<span v-if="activity.type">{{ activity.type }}</span> <span v-if="activity.type">{{ activity.type }}</span>
<span <span
v-if="activity.data.field" v-if="activity.data.field_label"
class="text-gray-900 truncate max-w-xs" class="text-gray-900 truncate max-w-xs"
> >
{{ activity.data.field }} {{ activity.data.field_label }}
</span> </span>
<span v-if="activity.value">{{ activity.value }}</span> <span v-if="activity.value">{{ activity.value }}</span>
<span <span