From 19dd64eb2504a058275d523a0c4a186815b4da6d Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Wed, 1 Jun 2016 12:53:47 +0530 Subject: [PATCH] [fix] Naming of docs --- frappe/core/doctype/file/file.py | 3 +-- frappe/core/doctype/user/user.py | 4 +++- frappe/model/naming.py | 4 ++++ frappe/utils/install.py | 4 ++-- 4 files changed, 10 insertions(+), 5 deletions(-) diff --git a/frappe/core/doctype/file/file.py b/frappe/core/doctype/file/file.py index 32f9068909..f0a14e8e37 100644 --- a/frappe/core/doctype/file/file.py +++ b/frappe/core/doctype/file/file.py @@ -35,14 +35,13 @@ class File(NestedSet): def before_insert(self): frappe.local.rollback_observers.append(self) self.set_folder_name() - self.set_name() def get_name_based_on_parent_folder(self): path = get_breadcrumbs(self.folder) folder_name = frappe.get_value("File", self.folder, "file_name") return "/".join([d.file_name for d in path] + [folder_name, self.file_name]) - def set_name(self): + def autoname(self): """Set name for folder""" if self.is_folder: if self.folder: diff --git a/frappe/core/doctype/user/user.py b/frappe/core/doctype/user/user.py index 521b43b0c5..2f3d409c9c 100644 --- a/frappe/core/doctype/user/user.py +++ b/frappe/core/doctype/user/user.py @@ -20,7 +20,9 @@ class User(Document): __new_password = None def autoname(self): """set name as email id""" - if self.name not in STANDARD_USERS: + if self.get("is_admin") or self.get("is_guest"): + self.name = self.first_name + else: self.email = self.email.strip() self.name = self.email diff --git a/frappe/model/naming.py b/frappe/model/naming.py index 680823325e..a6e31dbe0d 100644 --- a/frappe/model/naming.py +++ b/frappe/model/naming.py @@ -23,6 +23,10 @@ def set_new_name(doc): doc.run_method("before_naming") autoname = frappe.get_meta(doc.doctype).autoname + + if autoname != "Prompt": + doc.name = None + if getattr(doc, "amended_from", None): _set_amended_name(doc) return diff --git a/frappe/utils/install.py b/frappe/utils/install.py index c21d055c14..cb5985b46c 100644 --- a/frappe/utils/install.py +++ b/frappe/utils/install.py @@ -42,11 +42,11 @@ def install_basic_docs(): # core users / roles install_docs = [ {'doctype':'User', 'name':'Administrator', 'first_name':'Administrator', - 'email':'admin@example.com', 'enabled':1, + 'email':'admin@example.com', 'enabled':1, "is_admin": 1, 'user_roles': [{'role': 'Administrator'}] }, {'doctype':'User', 'name':'Guest', 'first_name':'Guest', - 'email':'guest@example.com', 'enabled':1, + 'email':'guest@example.com', 'enabled':1, "is_guest": 1, 'user_roles': [{'role': 'Guest'}] }, {'doctype': "Role", "role_name": "Report Manager"},