浏览代码

[minor] ignore_csrf in site_config and to check for autoname in hooks even if not autoname is present

version-14
Rushabh Mehta 9 年前
父节点
当前提交
d235f159bb
共有 2 个文件被更改,包括 6 次插入4 次删除
  1. +3
    -1
      frappe/auth.py
  2. +3
    -3
      frappe/model/naming.py

+ 3
- 1
frappe/auth.py 查看文件

@@ -64,7 +64,9 @@ class HTTPRequest:


def validate_csrf_token(self): def validate_csrf_token(self):
if frappe.local.request and frappe.local.request.method=="POST": if frappe.local.request and frappe.local.request.method=="POST":
if not frappe.local.session.data.csrf_token or frappe.local.session.data.device=="mobile":
if not frappe.local.session.data.csrf_token \
or frappe.local.session.data.device=="mobile" \
or frappe.conf.get('ignore_csrf', None):
# not via boot # not via boot
return return




+ 3
- 3
frappe/model/naming.py 查看文件

@@ -30,10 +30,10 @@ def set_new_name(doc):
elif getattr(doc.meta, "issingle", False): elif getattr(doc.meta, "issingle", False):
doc.name = doc.doctype doc.name = doc.doctype


elif hasattr(doc, "autoname"):
else:
doc.run_method("autoname") doc.run_method("autoname")


elif autoname:
if not doc.name and autoname:
if autoname.startswith('field:'): if autoname.startswith('field:'):
fieldname = autoname[6:] fieldname = autoname[6:]
doc.name = (doc.get(fieldname) or "").strip() doc.name = (doc.get(fieldname) or "").strip()
@@ -195,7 +195,7 @@ def append_number_if_name_exists(doc):
count = "1" count = "1"


doc.name = "{0}-{1}".format(doc.name, count) doc.name = "{0}-{1}".format(doc.name, count)
return doc return doc


def de_duplicate(doctype, name): def de_duplicate(doctype, name):


正在加载...
取消
保存