From 4e6ea8fdbd7462f22f8c8188fedee0b19dfebdc2 Mon Sep 17 00:00:00 2001 From: Suraj Shetty Date: Thu, 28 Oct 2021 15:25:45 +0530 Subject: [PATCH] fix: Docstring of has_permission & made error title translatable - doctype -> DocType - fixed other typo --- frappe/__init__.py | 2 +- frappe/permissions.py | 8 ++++---- frappe/tests/test_permissions.py | 6 +++--- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/frappe/__init__.py b/frappe/__init__.py index e43017f71f..ce8bbefe3b 100644 --- a/frappe/__init__.py +++ b/frappe/__init__.py @@ -725,7 +725,7 @@ def has_permission(doctype=None, ptype="read", doc=None, user=None, verbose=Fals :param ptype: Permission type (`read`, `write`, `create`, `submit`, `cancel`, `amend`). Default: `read`. :param doc: [optional] Checks User permissions for given doc. :param user: [optional] Check for given user. Default: current user. - :param parent_doctype: [optional] Useful while checking permission for child doctype. Default: None""" + :param parent_doctype: Required when checking permission for a child DocType (unless doc is specified).""" if not doctype and doc: doctype = doc.doctype diff --git a/frappe/permissions.py b/frappe/permissions.py index 849bc5c7a6..96e1910462 100644 --- a/frappe/permissions.py +++ b/frappe/permissions.py @@ -575,14 +575,14 @@ def has_child_table_permission(child_doctype, ptype="read", child_doc=None, if parent_doctype: if not is_parent_valid(child_doctype, parent_doctype): - frappe.throw(_("{0} is not a valid parent doctype {1}").format( + frappe.throw(_("{0} is not a valid parent DocType for {1}").format( frappe.bold(parent_doctype), frappe.bold(child_doctype) - ), title="Invalid Parent DocType") + ), title=_("Invalid Parent DocType")) else: - frappe.throw(_("Please specify a valid parent doctype for {0}").format( + frappe.throw(_("Please specify a valid parent DocType for {0}").format( frappe.bold(child_doctype) - ), title="Parent DocType Required") + ), title=_("Parent DocType Required")) return has_permission(parent_doctype, ptype=ptype, doc=parent_doc, verbose=verbose, user=user, raise_exception=raise_exception) diff --git a/frappe/tests/test_permissions.py b/frappe/tests/test_permissions.py index 9887676f78..b4e7db9956 100644 --- a/frappe/tests/test_permissions.py +++ b/frappe/tests/test_permissions.py @@ -598,8 +598,8 @@ class TestPermissions(unittest.TestCase): frappe.set_user("test@example.com") self.assertIsInstance(frappe.get_list("Has Role", parent_doctype="User", limit=1), list) self.assertRaisesRegex(frappe.exceptions.ValidationError, - ".* is not a valid parent doctype .*", frappe.get_list, doctype="Has Role", parent_doctype="ToDo") + ".* is not a valid parent DocType for .*", frappe.get_list, doctype="Has Role", parent_doctype="ToDo") self.assertRaisesRegex(frappe.exceptions.ValidationError, - "Please specify a valid parent doctype for .*", frappe.get_list, "Has Role") + "Please specify a valid parent DocType for .*", frappe.get_list, "Has Role") self.assertRaisesRegex(frappe.exceptions.ValidationError, - ".* is not a valid parent doctype .*", frappe.get_list, doctype="Has Role", parent_doctype="Has Role") + ".* is not a valid parent DocType for .*", frappe.get_list, doctype="Has Role", parent_doctype="Has Role")