[feature] Global Search (again)

frappe/core/doctype/doctype/doctype.py

@@ -33,7 +33,7 @@ def validate(self):
 		- Validate series
 		- Check fieldnames (duplication etc)
 		- Clear permission table for child tables
-		- Add `amended_from` and `ameneded_by` if Amendable"""
+		- Add `amended_from` and `amended_by` if Amendable"""
 		self.check_developer_mode()
 
 		self.validate_name()
@@ -59,6 +59,12 @@ def validate(self):
 
 		self.make_amendable()
 		self.validate_website()
+
+		try:
+			self.before_update = frappe.get_doc('DocType', self.name)
+		except frappe.DoesNotExistError:
+			pass
+
 		if not self.is_new():
 			self.setup_fields_to_fetch()
 
@@ -162,6 +168,7 @@ def validate_series(self, autoname=None, name=None):
 			self.autoname = "naming_series:"
 
 		# validate field name if autoname field:fieldname is used
+
 		if autoname and autoname.startswith('field:'):
 			field = autoname.split(":")[1]
 			if not field or field not in [ df.fieldname for df in self.fields ]:
@@ -201,13 +208,31 @@ def on_update(self):
 		delete_notification_count_for(doctype=self.name)
 		frappe.clear_cache(doctype=self.name)
 
+		if not frappe.flags.in_install and hasattr(self, 'before_update'):
+			self.sync_global_search()
+
+	def sync_global_search(self):
+		'''If global search settings are changed, rebuild search properties for this table'''
+		global_search_fields_before_update = [d.fieldname for d in
+			self.before_update.fields if d.in_global_search]
+		if self.before_update.show_name_in_global_search:
+			global_search_fields_before_update.append('name')
+
+		global_search_fields_after_update = [d.fieldname for d in
+			self.fields if d.in_global_search]
+		if self.show_name_in_global_search:
+			global_search_fields_after_update.append('name')
+
+		if set(global_search_fields_before_update) != set(global_search_fields_after_update):
+			frappe.enqueue('frappe.utils.global_search.rebuild_for_doctype',
+				now=frappe.flags.in_test, doctype=self.name)
+
 	def run_module_method(self, method):
 		from frappe.modules import load_doctype_module
 		module = load_doctype_module(self.name, self.module)
 		if hasattr(module, method):
 			getattr(module, method)()
 
-
 	def before_rename(self, old, new, merge=False):
 		"""Throw exception if merge. DocTypes cannot be merged."""
 		if not self.custom and frappe.session.user != "Administrator":
@@ -263,7 +288,7 @@ def import_doc(self):
 		import_from_files(record_list=[[self.module, 'doctype', self.name]])
 
 	def make_controller_template(self):
-		"""Make boilderplate controller template."""
+		"""Make boilerplate controller template."""
 		make_boilerplate("controller.py", self)
 
 		if not (self.istable or self.issingle):

frappe/custom/doctype/customize_form/customize_form.py

@@ -43,6 +43,7 @@
 	'ignore_user_permissions': 'Check',
 	'in_list_view': 'Check',
 	'in_standard_filter': 'Check',
+	'in_global_search': 'Check',
 	'hidden': 'Check',
 	'collapsible': 'Check',
 	'collapsible_depends_on': 'Data',

frappe/custom/doctype/customize_form/test_customize_form.py

@@ -51,7 +51,8 @@ def test_fetch_to_customize(self):
 		d = self.get_customize_form("User")
 		self.assertEquals(d.doc_type, "User")
 
-		self.assertEquals(len(d.get("fields")), len(frappe.get_doc("DocType", d.doc_type).fields) + 1)
+		self.assertEquals(len(d.get("fields")),
+			len(frappe.get_doc("DocType", d.doc_type).fields) + 1)
 		self.assertEquals(d.get("fields")[-1].fieldname, "test_custom_field")
 		self.assertEquals(d.get("fields", {"fieldname": "location"})[0].in_list_view, 1)