vassili/seitime-frappe
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

feat: allowed the auto name in Customize Form

Browse source 
(cherry picked from commit 607dcce21b)
This commit is contained in:
Anupam 2021-03-23 11:14:10 +05:30 • committed by mergify-bot
parent 80d3fd293f
commit 7150638d8b
2 changed files with 19 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
frappe/core/doctype/doctype/doctype.py
View file

@ -628,17 +628,23 @@ class DocType(Document):
validate_route_conflict(self.doctype, self.name)
def validate_series(dt):
if not dt.autoname and dt.get("fields", {"fieldname":"naming_series"}):
def validate_series(dt, autoname=None, name=None):
"""Validate if `autoname` property is correctly set."""
if not autoname:
autoname = dt.autoname
if not name:
name = dt.name
if not autoname and dt.get("fields", {"fieldname":"naming_series"}):
dt.autoname = "naming_series:"
elif dt.autoname == "naming_series:" and not dt.get("fields", {"fieldname":"naming_series"}):
frappe.throw(_("Invalid fieldname '{0}' in autoname").format(dt.autoname))
# validate field name if autoname field:fieldname is used
# Create unique index on autoname field automatically.
if dt.autoname and dt.autoname.startswith('field:'):
field = dt.autoname.split(":")[1]
if not field or field not in [ df.fieldname for df in dt.fields ]:
if autoname and autoname.startswith('field:'):
field = autoname.split(":")[1]
if not field or field not in [df.fieldname for df in dt.fields]:
frappe.throw(_("Invalid fieldname '{0}' in autoname").format(field))
else:
for df in dt.fields:
@ -646,19 +652,19 @@ def validate_series(dt):
df.unique = 1
break
if dt.autoname and (not dt.autoname.startswith('field:')) \
and (not dt.autoname.startswith('eval:')) \
and (not dt.autoname.lower() in ('prompt', 'hash')) \
and (not dt.autoname.startswith('naming_series:')) \
and (not dt.autoname.startswith('format:')):
if autoname and (not autoname.startswith('field:')) \
and (not autoname.startswith('eval:')) \
and (not autoname.lower() in ('prompt', 'hash')) \
and (not autoname.startswith('naming_series:')) \
and (not autoname.startswith('format:')):
prefix = dt.autoname.split('.')[0]
prefix = autoname.split('.')[0]
used_in = frappe.db.sql("""
SELECT `name`
FROM `tabDocType`
WHERE `autoname` LIKE CONCAT(%s, '.%%')
AND `name`!=%s
""", (prefix, dt.name))
""", (prefix, name))
if used_in:
frappe.throw(_("Series {0} already used in {1}").format(prefix, used_in[0][0]))

2
frappe/custom/doctype/customize_form/customize_form.py
View file

@ -136,7 +136,7 @@ class CustomizeForm(Document):
def save_customization(self):
if not self.doc_type:
return
validate_series(self)
validate_series(self, self.autoname, self.doc_type)
self.flags.update_db = False
self.flags.rebuild_doctype_for_global_search = False
self.set_property_setters()