Переглянути джерело

chore: add deprecation warning everywhere verbose is used

(cherry picked from commit d6aa17cc14)
version-14
Sagar Vora 2 роки тому
committed by Mergify
джерело
коміт
8fabacd7e3
4 змінених файлів з 23 додано та 9 видалено
  1. +13
    -4
      frappe/__init__.py
  2. +1
    -0
      frappe/model/db_query.py
  3. +7
    -4
      frappe/model/document.py
  4. +2
    -1
      frappe/permissions.py

+ 13
- 4
frappe/__init__.py Переглянути файл

@@ -912,15 +912,25 @@ def only_has_select_perm(doctype, user=None, ignore_permissions=False):


def has_permission(
doctype=None, ptype="read", doc=None, user=None, verbose=False, throw=False, parent_doctype=None
doctype=None,
ptype="read",
doc=None,
user=None,
verbose=False,
throw=False,
*,
parent_doctype=None,
):
"""Raises `frappe.PermissionError` if not permitted.
"""
Raises `frappe.PermissionError` if not permitted.

:param doctype: DocType for which permission is to be check.
: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: Required when checking permission for a child DocType (unless doc is specified)."""
:param verbose: DEPRECATED, will be removed in a future release.
:param parent_doctype: Required when checking permission for a child DocType (unless doc is specified).
"""
import frappe.permissions

if not doctype and doc:
@@ -930,7 +940,6 @@ def has_permission(
doctype,
ptype,
doc=doc,
verbose=verbose,
user=user,
raise_exception=throw,
parent_doctype=parent_doctype,


+ 1
- 0
frappe/model/db_query.py Переглянути файл

@@ -97,6 +97,7 @@ class DatabaseQuery:
strict=True,
pluck=None,
ignore_ddl=False,
*,
parent_doctype=None,
) -> list:



+ 7
- 4
frappe/model/document.py Переглянути файл

@@ -194,15 +194,18 @@ class Document(BaseDocument):
self.raise_no_permission_to(permlevel or permtype)

def has_permission(self, permtype="read", verbose=False) -> bool:
"""Call `frappe.has_permission` if `self.flags.ignore_permissions`
is not set.
"""
Call `frappe.has_permission` if `self.flags.ignore_permissions` is not set.

:param permtype: one of `read`, `write`, `submit`, `cancel`, `delete`"""
:param permtype: one of `read`, `write`, `submit`, `cancel`, `delete`
:param verbose: DEPRECATED, will be removed in a future release.
"""
import frappe.permissions

if self.flags.ignore_permissions:
return True
return frappe.permissions.has_permission(self.doctype, permtype, self, verbose=verbose)

return frappe.permissions.has_permission(self.doctype, permtype, self)

def raise_no_permission_to(self, perm_type):
"""Raise `frappe.PermissionError`."""


+ 2
- 1
frappe/permissions.py Переглянути файл

@@ -68,6 +68,7 @@ def has_permission(
verbose=False,
user=None,
raise_exception=True,
*,
parent_doctype=None,
):
"""Returns True if user has permission `ptype` for given `doctype`.
@@ -76,7 +77,7 @@ def has_permission(
:param doctype: DocType to check permission for
:param ptype: Permission Type to check
:param doc: Check User Permissions for specified document.
:param verbose: DEPRECATED, will be removed in a future version.
:param verbose: DEPRECATED, will be removed in a future release.
:param user: User to check permission for. Defaults to session user.
:param raise_exception:
DOES NOT raise an exception.


Завантаження…
Відмінити
Зберегти