Merge branch 'staging' into production

Author: sahil28297

README.md

@@ -14,15 +14,15 @@
 </div>
 
 <div align="center">
-    <a href="https://travis-ci.org/DigiThinkIT/frappe">
-        <img src="https://img.shields.io/travis/DigiThinkIT/frappe.svg?style=flat-square">
+    <a href="https://travis-ci.com/Bloomstack/frappe">
+        <img src="https://travis-ci.com/Bloomstack/frappe.svg?branch=develop">
     </a>
     <a href='https://frappe.io/docs'>
         <img src='https://img.shields.io/badge/docs-📖-7575FF.svg?style=flat-square'/>
     </a>
-	<a href='https://www.codetriage.com/frappe/frappe'>
-		<img src='https://www.codetriage.com/frappe/frappe/badges/users.svg'>
-	</a>
+    <a href='https://www.codetriage.com/frappe/frappe'>
+	<img src='https://www.codetriage.com/frappe/frappe/badges/users.svg'>
+    </a>
     <a href='https://coveralls.io/github/frappe/frappe?branch=develop'>
         <img src='https://coveralls.io/repos/github/frappe/frappe/badge.svg?branch=develop'>
     </a>

cypress/integration/control_link.js

@@ -47,12 +47,10 @@ context('Control Link', () => {
 		get_dialog_with_link().as('dialog');
 
 		cy.server();
-		cy.route('GET', '/api/method/frappe.desk.form.utils.validate_link*').as('validate_link');
 
 		cy.get('.frappe-control[data-fieldname=link] input')
 			.type('invalid value', { delay: 100 })
 			.blur();
-		cy.wait('@validate_link');
 		cy.get('.frappe-control[data-fieldname=link] input').should('have.value', '');
 	});
 
@@ -64,10 +62,11 @@ context('Control Link', () => {
 		cy.route('POST', '/api/method/frappe.desk.search.search_link').as('search_link');
 
 		cy.get('@todos').then(todos => {
-			cy.get('.frappe-control[data-fieldname=link] input').as('input');
-			cy.get('@input').focus();
+			cy.get('.frappe-control[data-fieldname=link] input').focus().as('input');
 			cy.wait('@search_link');
-			cy.get('@input').type(todos[0]).blur();
+			cy.get('@input').type(todos[0]);
+			cy.get('.frappe-control[data-fieldname=link] ul').should('be.visible');
+			cy.get('.frappe-control[data-fieldname=link] input').type('{enter}', { delay: 100 });
 			cy.wait('@validate_link');
 			cy.get('@input').focus();
 			cy.get('.frappe-control[data-fieldname=link] .link-btn')
@@ -76,4 +75,35 @@ context('Control Link', () => {
 			cy.location('hash').should('eq', `#Form/ToDo/${todos[0]}`);
 		});
 	});
+
+	it('show title field in link', () => {
+		get_dialog_with_link().as('dialog');
+
+		cy.server();
+		cy.insert_doc("Property Setter", {
+			property: "show_title_field_in_link",
+			doc_type: "ToDo",
+			value: 1,
+			doctype_or_field: "DocType"
+		}, true);
+		cy.route('POST', '/api/method/frappe.desk.search.search_link').as('search_link');
+
+		cy.get('.frappe-control[data-fieldname=link] input').focus().as('input');
+		cy.wait('@search_link');
+		cy.get('@input').type('todo for link');
+		cy.wait('@search_link');
+		cy.get('.frappe-control[data-fieldname=link] ul').should('be.visible');
+		cy.get('.frappe-control[data-fieldname=link] input').type('{enter}', { delay: 100 });
+		cy.get('.frappe-control[data-fieldname=link] input').blur();
+		cy.get('@dialog').then(dialog => {
+			cy.get('@todos').then(todos => {
+				let field = dialog.get_field('link');
+				let value = field.get_value();
+				let label = field.get_label_value();
+
+				expect(value).to.eq(todos[0]);
+				expect(label).to.eq('this is a test todo for link');
+			});
+		});
+	});
 });

frappe/__init__.py

@@ -24,7 +24,7 @@
 	sys.setdefaultencoding("utf-8")
 
 __frappe_version__ = '12.8.1'
-__version__ = '2.0.6'
+__version__ = '2.0.7'
 __title__ = "Frappe Framework"
 
 local = Local()

frappe/automation/doctype/auto_repeat/auto_repeat.json

@@ -188,7 +188,7 @@
    "label": "Repeat on Last Day of the Month"
   }
  ],
- "modified": "2019-07-17 11:30:51.412317",
+ "modified": "2020-12-31 00:50:50.740293",
  "modified_by": "Administrator",
  "module": "Automation",
  "name": "Auto Repeat",
@@ -231,7 +231,6 @@
    "write": 1
   }
  ],
- "search_fields": "reference_document",
  "sort_field": "modified",
  "sort_order": "DESC",
  "title_field": "reference_document",

frappe/boot.py

@@ -82,6 +82,7 @@ def get_bootinfo():
 	bootinfo.points = get_energy_points(frappe.session.user)
 	bootinfo.frequently_visited_links = frequently_visited_links()
 	bootinfo.link_preview_doctypes = get_link_preview_doctypes()
+	bootinfo.doctypes_with_show_link_field_title = doctypes_with_show_link_field_title()
 
 	return bootinfo
 
@@ -266,4 +267,10 @@ def get_success_action():
 	return frappe.get_all("Success Action", fields=["*"])
 
 def get_link_preview_doctypes():
-	return [d.name for d in frappe.db.get_all('DocType', {'show_preview_popup': 1})]
+	return [d.name for d in frappe.db.get_all('DocType', {'show_preview_popup': 1})]
+
+def doctypes_with_show_link_field_title():
+	dts = frappe.get_all("DocType", {"show_title_field_in_link": 1})
+	custom_dts = frappe.get_all("Property Setter", {"field_name": "show_title_field_in_link", "value": 1})
+
+	return [d.name for d in dts + custom_dts if d]

frappe/chat/doctype/chat_message/chat_message.json

@@ -62,7 +62,7 @@
    "label": "URLs"
   }
  ],
- "modified": "2019-11-07 13:21:19.395927",
+ "modified": "2020-12-31 00:50:42.122683",
  "modified_by": "Administrator",
  "module": "Chat",
  "name": "Chat Message",
@@ -82,7 +82,7 @@
   }
  ],
  "quick_entry": 1,
- "search_fields": "content, user",
+ "search_fields": "user",
  "sort_field": "modified",
  "sort_order": "DESC",
  "title_field": "content",

frappe/chat/doctype/chat_room/chat_room.json

@@ -71,7 +71,7 @@
   }
  ],
  "image_field": "avatar",
- "modified": "2019-11-07 13:20:24.625329",
+ "modified": "2020-12-31 00:50:42.734785",
  "modified_by": "Administrator",
  "module": "Chat",
  "name": "Chat Room",
@@ -91,7 +91,6 @@
    "write": 1
   }
  ],
- "search_fields": "room_name",
  "show_name_in_global_search": 1,
  "sort_field": "modified",
  "sort_order": "DESC",