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

fix!: Swap old style naming with new one

Browse source 
"new" style of naming uses `format:` which is broken and unfixable. This
commit discourages use of the new style.

What was referred to as "old style" already works just fine and supports
all the same things.

ref https://github.com/frappe/frappe/issues/21212
This commit is contained in:
Ankush Menat 2025-12-15 12:01:39 +05:30
parent 2fff325fa8
commit 7b7c6390f4
3 changed files with 20 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
cypress/integration/customize_form.js
View file

@ -10,8 +10,8 @@ context("Customize Form", () => {
const naming_rule_default_autoname_map = {
"Set by user": "prompt",
"By fieldname": "field:",
Expression: "format:",
"Expression (old style)": "",
Expression: "",
"Expression (old style)": "format:",
Random: "hash",
"By script": "",
};

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

@ -216,6 +216,7 @@ class DocType(Document):
self.validate_website()
self.validate_virtual_doctype_methods()
self.ensure_minimum_max_attachment_limit()
self.patch_old_naming_expressions()
validate_links_table_fieldnames(self)
if not self.is_new():
@ -447,6 +448,17 @@ class DocType(Document):
alert=True,
)
def patch_old_naming_expressions(self):
if not self.autoname:
return
# We swapped naming_rule field old/new to discourage use of "format:"
if self.autoname and self.autoname.startswith("format:"):
self.naming_rule = "Expression (old style)"
if self.naming_rule == "Expression (old style)" and not self.autoname.startswith("format:"):
self.naming_rule = "Expression"
def change_modified_of_parent(self):
"""Change the timestamp of parent DocType if the current one is a child to clear caches."""
if frappe.flags.in_import:

12
frappe/public/js/frappe/doctype/index.js
View file

@ -75,8 +75,8 @@ frappe.model.DocTypeController = class DocTypeController extends frappe.ui.form.
"Set by user": "prompt",
"By fieldname": "field:",
'By "Naming Series" field': "naming_series:",
Expression: "format:",
"Expression (sld style)": "",
Expression: "",
"Expression (old style)": "format:",
Random: "hash",
UUID: "UUID",
"By script": "",
@ -99,9 +99,9 @@ frappe.model.DocTypeController = class DocTypeController extends frappe.ui.form.
"By fieldname": "Format: <code>field:[fieldname]</code>. Valid fieldname must exist",
'By "Naming Series" field':
"Format: <code>naming_series:[fieldname]</code>. Default fieldname is <code>naming_series</code>",
Expression:
"Format: <code>format:EXAMPLE-{MM}morewords{fieldname1}-{fieldname2}-{#####}</code> - Replace all braced words (fieldnames, date words (DD, MM, YY), series) with their value. Outside braces, any characters can be used.",
"Expression (old style)":
"Format: <code>format:EXAMPLE-{MM}morewords{fieldname1}-{fieldname2}-{#####}</code> - Replace all braced words (fieldnames, date words (DD, MM, YY), series) with their value. Outside braces, any characters can be used.",
Expression:
"Format: <code>EXAMPLE-.#####</code> Series by prefix (separated by a dot)",
Random: "",
"By script": "",
@ -129,9 +129,9 @@ frappe.model.DocTypeController = class DocTypeController extends frappe.ui.form.
else if (autoname.startsWith("naming_series:"))
this.frm.set_value("naming_rule", 'By "Naming Series" field');
else if (autoname.startsWith("format:"))
this.frm.set_value("naming_rule", "Expression");
this.frm.set_value("naming_rule", "Expression (old style)");
else if (autoname === "hash") this.frm.set_value("naming_rule", "Random");
else this.frm.set_value("naming_rule", "Expression (old style)");
else this.frm.set_value("naming_rule", "Expression");
setTimeout(() => (this.frm.__from_autoname = false), 500);
}