test/crm
1
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: added is_view check to differentiate between standard view

Browse Source
This commit is contained in:
Shariq Ansari 2024-01-22 22:37:31 +05:30
parent a3b7f030f8
commit 196eb89154
4 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
crm/api/doc.py
View File

@ -212,7 +212,7 @@ def get_list_data(
"page_length": page_length, "page_length": page_length,
"page_length_count": page_length_count, "page_length_count": page_length_count,
"is_default": is_default, "is_default": is_default,
"views": get_views(doctype), "views": get_views(doctype, is_view=True),
"total_count": frappe.client.get_count(doctype, filters=filters), "total_count": frappe.client.get_count(doctype, filters=filters),
"row_count": len(data), "row_count": len(data),
} }

4
crm/api/views.py
View File

@ -3,7 +3,7 @@ from pypika import Criterion
@frappe.whitelist() @frappe.whitelist()
def get_views(doctype): def get_views(doctype, is_view=False):
if frappe.session.user == "Guest": if frappe.session.user == "Guest":
frappe.throw("Authentication failed", exc=frappe.AuthenticationError) frappe.throw("Authentication failed", exc=frappe.AuthenticationError)
@ -13,6 +13,8 @@ def get_views(doctype):
.select("*") .select("*")
.where(Criterion.any([View.user == '', View.user == frappe.session.user])) .where(Criterion.any([View.user == '', View.user == frappe.session.user]))
) )
if is_view:
query = query.where(View.is_view == True)
if doctype: if doctype:
query = query.where(View.dt == doctype) query = query.where(View.dt == doctype)
views = query.run(as_dict=True) views = query.run(as_dict=True)

9
crm/fcrm/doctype/crm_view_settings/crm_view_settings.json
View File

@ -12,6 +12,7 @@
"route_name", "route_name",
"pinned", "pinned",
"public", "public",
"is_view",
"columns_tab", "columns_tab",
"load_default_columns", "load_default_columns",
"columns", "columns",
@ -104,11 +105,17 @@
"fieldname": "public", "fieldname": "public",
"fieldtype": "Check", "fieldtype": "Check",
"label": "Public" "label": "Public"
},
{
"default": "0",
"fieldname": "is_view",
"fieldtype": "Check",
"label": "Is View"
} }
], ],
"index_web_pages_for_search": 1, "index_web_pages_for_search": 1,
"links": [], "links": [],
"modified": "2024-01-19 21:44:52.285420", "modified": "2024-01-22 21:44:41.733977",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "FCRM", "module": "FCRM",
"name": "CRM View Settings", "name": "CRM View Settings",

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

@ -24,6 +24,7 @@ def create(view):
doc = frappe.new_doc("CRM View Settings") doc = frappe.new_doc("CRM View Settings")
doc.name = view.label doc.name = view.label
doc.label = view.label doc.label = view.label
doc.is_view = True
doc.dt = view.doctype doc.dt = view.doctype
doc.user = frappe.session.user doc.user = frappe.session.user
doc.route_name = view.route_name or "" doc.route_name = view.route_name or ""
@ -49,6 +50,7 @@ def update(view):
doc = frappe.get_doc("CRM View Settings", view.name) doc = frappe.get_doc("CRM View Settings", view.name)
doc.label = view.label doc.label = view.label
doc.is_view = True
doc.route_name = view.route_name or "" doc.route_name = view.route_name or ""
doc.load_default_columns = view.load_default_columns or False doc.load_default_columns = view.load_default_columns or False
doc.filters = json.dumps(filters) doc.filters = json.dumps(filters)