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

fix: load deal_owner as assigned to if _assign is not set

Browse Source
This commit is contained in:
Shariq Ansari 2024-01-21 21:43:32 +05:30
parent d077ab212a
commit cd01b452e1
3 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
crm/fcrm/doctype/crm_view_settings/crm_view_settings.py
View File

@ -14,8 +14,8 @@ def create(view):
view = frappe._dict(view) view = frappe._dict(view)
view.filters = parse_json(view.filters) or {} view.filters = parse_json(view.filters) or {}
view.columns = parse_json(view.columns) or [] view.columns = parse_json(view.columns or '[]')
view.rows = parse_json(view.rows) or [] view.rows = parse_json(view.rows or '[]')
default_rows = sync_default_list_rows(view.doctype) default_rows = sync_default_list_rows(view.doctype)
view.rows = view.rows + default_rows if default_rows else view.rows view.rows = view.rows + default_rows if default_rows else view.rows

3
frontend/src/pages/Deals.vue
View File

@ -137,6 +137,9 @@ const rows = computed(() => {
} }
} else if (row == '_assign') { } else if (row == '_assign') {
let assignees = JSON.parse(deal._assign) || [] let assignees = JSON.parse(deal._assign) || []
if (!assignees.length && deal.deal_owner) {
assignees = [deal.deal_owner]
}
_rows[row] = assignees.map((user) => ({ _rows[row] = assignees.map((user) => ({
name: user, name: user,
image: getUser(user).user_image, image: getUser(user).user_image,

3
frontend/src/pages/Leads.vue
View File

@ -134,6 +134,9 @@ const rows = computed(() => {
} }
} else if (row == '_assign') { } else if (row == '_assign') {
let assignees = JSON.parse(lead._assign) || [] let assignees = JSON.parse(lead._assign) || []
if (!assignees.length && lead.lead_owner) {
assignees = [lead.lead_owner]
}
_rows[row] = assignees.map((user) => ({ _rows[row] = assignees.map((user) => ({
name: user, name: user,
image: getUser(user).user_image, image: getUser(user).user_image,