Browse Source

refactor: Rename function and add docstring

Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
(cherry picked from commit 843c544117)
version-14
Gavin D'souza 4 years ago
committed by mergify-bot
parent
commit
56606ebc44
2 changed files with 5 additions and 3 deletions
  1. +3
    -1
      frappe/core/doctype/doctype/doctype.py
  2. +2
    -2
      frappe/custom/doctype/custom_field/custom_field.py

+ 3
- 1
frappe/core/doctype/doctype/doctype.py View File

@@ -1223,7 +1223,9 @@ def make_module_and_roles(doc, perm_fieldname="permissions"):
else:
raise

def check_if_fieldname_conflicts_with_properties_and_methods(doctype, fieldname):
def check_fieldname_conflicts(doctype, fieldname):
"""Checks if fieldname conflicts with methods or properties"""

doc = frappe.get_doc({"doctype": doctype})
available_objects = [x for x in dir(doc) if isinstance(x, str)]
property_list = [


+ 2
- 2
frappe/custom/doctype/custom_field/custom_field.py View File

@@ -64,8 +64,8 @@ class CustomField(Document):
self.translatable = 0

if not self.flags.ignore_validate:
from frappe.core.doctype.doctype.doctype import check_if_fieldname_conflicts_with_properties_and_methods
check_if_fieldname_conflicts_with_properties_and_methods(self.dt, self.fieldname)
from frappe.core.doctype.doctype.doctype import check_fieldname_conflicts
check_fieldname_conflicts(self.dt, self.fieldname)

def on_update(self):
if not frappe.flags.in_setup_wizard:


Loading…
Cancel
Save