[refactor] has_website_permission parameters

frappe/__init__.py

@@ -489,7 +489,7 @@ def has_permission(doctype=None, ptype="read", doc=None, user=None, verbose=Fals
 
 	return out
 
-def has_website_permission(doctype, ptype="read", doc=None, user=None, verbose=False):
+def has_website_permission(doc=None, ptype='read', user=None, verbose=False):
 	"""Raises `frappe.PermissionError` if not permitted.
 
 	:param doctype: DocType for which permission is to be check.
@@ -504,6 +504,8 @@ def has_website_permission(doctype, ptype="read", doc=None, user=None, verbose=F
 		if isinstance(doc, basestring):
 			doc = get_doc(doctype, doc)
 
+		doctype = doc.doctype
+
 		if doc.flags.ignore_permissions:
 			return True
 

frappe/website/doctype/web_form/web_form.py

@@ -418,7 +418,7 @@ def has_web_form_permission(doctype, name, ptype='read'):
 	elif frappe.db.get_value(doctype, name, "owner")==frappe.session.user:
 		return True
 
-	elif frappe.has_website_permission(doctype, ptype=ptype, doc=name):
+	elif frappe.has_website_permission(name, ptype=ptype):
 		return True
 
 	elif check_webform_perm(doctype, name):

frappe/www/print.py

@@ -183,7 +183,7 @@ def validate_print_permission(doc):
 
 	for ptype in ("read", "print"):
 		if (not frappe.has_permission(doc.doctype, ptype, doc)
-			and not frappe.has_website_permission(doc.doctype, ptype, doc)):
+			and not frappe.has_website_permission(doc)):
 			raise frappe.PermissionError(_("No {0} permission").format(ptype))
 
 def get_letter_head(doc, no_letterhead):