Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: project route permissions for user

Browse Source
This commit is contained in:
Gursheen Anand 2023-07-20 18:20:53 +05:30
parent 610ead22e8
commit 5d7dd9b0ec
2 changed files with 31 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
erpnext/hooks.py
View File

@ -185,7 +185,7 @@ website_route_rules = [
] ]
standard_portal_menu_items = [ standard_portal_menu_items = [
{"title": "Projects", "route": "/project", "reference_doctype": "Project"}, {"title": "Projects", "route": "/project", "reference_doctype": "Project", "role": "Customer"},
{ {
"title": "Request for Quotations", "title": "Request for Quotations",
"route": "/rfq", "route": "/rfq",
@ -277,6 +277,7 @@ has_website_permission = {
"Delivery Note": "erpnext.controllers.website_list_for_contact.has_website_permission", "Delivery Note": "erpnext.controllers.website_list_for_contact.has_website_permission",
"Issue": "erpnext.support.doctype.issue.issue.has_website_permission", "Issue": "erpnext.support.doctype.issue.issue.has_website_permission",
"Timesheet": "erpnext.controllers.website_list_for_contact.has_website_permission", "Timesheet": "erpnext.controllers.website_list_for_contact.has_website_permission",
"Project": "erpnext.controllers.website_list_for_contact.has_website_permission",
} }
before_tests = "erpnext.setup.utils.before_tests" before_tests = "erpnext.setup.utils.before_tests"

40
erpnext/projects/doctype/project/project.py
View File

@ -10,6 +10,7 @@ from frappe.model.document import Document
from frappe.query_builder import Interval from frappe.query_builder import Interval
from frappe.query_builder.functions import Count, CurDate, Date, UnixTimestamp from frappe.query_builder.functions import Count, CurDate, Date, UnixTimestamp
from frappe.utils import add_days, flt, get_datetime, get_time, get_url, nowtime, today from frappe.utils import add_days, flt, get_datetime, get_time, get_url, nowtime, today
from frappe.utils.user import is_website_user
from erpnext import get_default_company from erpnext import get_default_company
from erpnext.controllers.queries import get_filters_cond from erpnext.controllers.queries import get_filters_cond
@ -319,15 +320,24 @@ def get_timeline_data(doctype: str, name: str) -> dict[int, int]:
def get_project_list( def get_project_list(
doctype, txt, filters, limit_start, limit_page_length=20, order_by="modified" doctype, txt, filters, limit_start, limit_page_length=20, order_by="modified"
): ):
user = frappe.session.user
customers, suppliers = get_customers_suppliers("Project", frappe.session.user) customers, suppliers = get_customers_suppliers("Project", frappe.session.user)
ignore_permissions = False
if is_website_user():
if not filters:
filters = []
if customers:
filters.append([doctype, "customer", "in", customers])
ignore_permissions = True
meta = frappe.get_meta(doctype) meta = frappe.get_meta(doctype)
if not filters:
filters = []
fields = "distinct *" fields = "distinct *"
or_filters = [] or_filters = []
filters.append([doctype, "customer", "in", customers])
if txt: if txt:
if meta.search_fields: if meta.search_fields:
@ -354,18 +364,26 @@ def get_project_list(
limit_start=limit_start, limit_start=limit_start,
limit_page_length=limit_page_length, limit_page_length=limit_page_length,
order_by=order_by, order_by=order_by,
ignore_permissions=ignore_permissions,
) )
def get_list_context(context=None): def get_list_context(context=None):
return { from erpnext.controllers.website_list_for_contact import get_list_context
"show_sidebar": True,
"show_search": True, list_context = get_list_context(context)
"no_breadcrumbs": True, list_context.update(
"title": _("Projects"), {
"get_list": get_project_list, "show_sidebar": True,
"row_template": "templates/includes/projects/project_row.html", "show_search": True,
} "no_breadcrumbs": True,
"title": _("Projects"),
"get_list": get_project_list,
"row_template": "templates/includes/projects/project_row.html",
}
)
return list_context
@frappe.whitelist() @frappe.whitelist()