Merge branch 'version-12-hotfix' into version-12

.eslintrc

@@ -51,7 +51,11 @@
 		],
 		"no-control-regex": [
 			"off"
-		]
+		],
+		"space-before-blocks": "warn",
+		"keyword-spacing": "warn",
+		"comma-spacing": "warn",
+		"key-spacing": "warn",
 	},
 	"root": true,
 	"globals": {

frappe/__init__.py

@@ -23,7 +23,7 @@
 	reload(sys)
 	sys.setdefaultencoding("utf-8")
 
-__version__ = '12.0.4'
+__version__ = '12.0.5'
 __title__ = "Frappe Framework"
 
 local = Local()

frappe/boot.py

@@ -82,6 +82,7 @@ def get_bootinfo():
 	bootinfo.energy_points_enabled = is_energy_point_enabled()
 	bootinfo.points = get_energy_points(frappe.session.user)
 	bootinfo.frequently_visited_links = frequently_visited_links()
+	bootinfo.link_preview_doctypes = get_link_preview_doctypes()
 
 	return bootinfo
 
@@ -262,3 +263,6 @@ def get_gsuite_status():
 
 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})]

frappe/core/doctype/data_import/data_import.py

@@ -15,7 +15,7 @@
 class DataImport(Document):
 	def autoname(self):
 		if not self.name:
-			self.name = "Import on "+ format_datetime(self.creation)
+			self.name = "Import on " +format_datetime(self.creation)
 
 	def validate(self):
 		if not self.import_file:

frappe/core/page/background_jobs/background_jobs.html

@@ -3,9 +3,9 @@
 	<table class="table table-bordered" style="table-layout: fixed;">
 		<thead>
 			<tr>
-				<th style="width: 20%">Queue / Worker</th>
-				<th>Job</th>
-				<th style="width: 15%">Created</th>
+				<th style="width: 20%">{{ _("Queue / Worker") }}</th>
+				<th>{{ _("Job") }}</th>
+				<th style="width: 15%">{{ _("Created") }}</th>
 			</tr>
 		</thead>
 		<tbody>
@@ -28,13 +28,13 @@
 		</tbody>
 	</table>
 	<p>
-		<span class="indicator blue" style="margin-right: 20px;">Started</span>
-		<span class="indicator orange" style="margin-right: 20px;">Queued</span>
-		<span class="indicator red" style="margin-right: 20px;">Failed</span>
-		<span class="indicator green">Finished</span>
+		<span class="indicator blue" style="margin-right: 20px;">{{ _("Started") }}</span>
+		<span class="indicator orange" style="margin-right: 20px;">{{ _("Queued") }}</span>
+		<span class="indicator red" style="margin-right: 20px;">{{ _("Failed") }}</span>
+		<span class="indicator green">{{ _("Finished") }}</span>
 	</p>
 	{% else %}
-	<p class="text-muted">No pending or current jobs for this site</p>
+	<p class="text-muted">{{ _("No pending or current jobs for this site") }}</p>
 	{% endif %}
-	<p class="text-muted" style="margin-top: 30px;">Last refreshed {{ frappe.datetime.now_datetime() }}</p>
-</div>
+	<p class="text-muted" style="margin-top: 30px;">{{ _("Last refreshed") }} {{ frappe.datetime.now_datetime() }}</p>
+</div>

frappe/core/page/background_jobs/background_jobs.js

@@ -1,7 +1,7 @@
 frappe.pages['background_jobs'].on_page_load = function(wrapper) {
 	var page = frappe.ui.make_app_page({
 		parent: wrapper,
-		title: 'Background Jobs',
+		title: __('Background Jobs'),
 		single_column: true
 	});
 

frappe/desk/link_preview.py

@@ -3,26 +3,41 @@
 import json
 
 @frappe.whitelist()
-def get_preview_data(doctype, docname, fields):
-	fields = json.loads(fields)
-	preview_fields = [field['name'] for field in fields if field['type'] not in no_value_fields]
-	preview_fields.append(frappe.get_meta(doctype).get_title_field())
-	if 'name' not in fields:
-		preview_fields.append('name')
-	preview_fields.append(frappe.get_meta(doctype).image_field)
+def get_preview_data(doctype, docname):
+	preview_fields = []
+	meta = frappe.get_meta(doctype)
+	if not meta.show_preview_popup: return
+
+	preview_fields = [field.fieldname for field in meta.fields \
+		if field.in_preview and field.fieldtype not in no_value_fields]
+
+	# no preview fields defined, build list from mandatory fields
+	if not preview_fields:
+		preview_fields = [field.name for field in meta.fields if field.reqd]
+
+	title_field = meta.get_title_field()
+	image_field = meta.image_field
+
+	preview_fields.append(title_field)
+	preview_fields.append(image_field)
+	preview_fields.append('name')
 
 	preview_data = frappe.get_list(doctype, filters={
 		'name': docname
 	}, fields=preview_fields, limit=1)
-	if preview_data:
-		preview_data = preview_data[0]
 
-		preview_data = {k: v for k, v in preview_data.items() if v is not None}
-		for k,v in preview_data.items():
-			if frappe.get_meta(doctype).has_field(k):
-				preview_data[k] = frappe.format(v,frappe.get_meta(doctype).get_field(k).fieldtype)
+	if not preview_data: return
+
+	preview_data = preview_data[0]
+
+	formatted_preview_data = {
+		'preview_image': preview_data.get(image_field),
+		'preview_title': preview_data.get(title_field),
+		'name': preview_data.get('name'),
+	}
 
-	if not preview_data:
-		return None
-	return preview_data
+	for key, val in preview_data.items():
+		if val and meta.has_field(key) and key not in [image_field, title_field, 'name']:
+			formatted_preview_data[meta.get_field(key).label] = frappe.format(val, meta.get_field(key).fieldtype)
 
+	return formatted_preview_data

frappe/email/__init__.py

@@ -91,7 +91,7 @@ def get_cached_contacts(txt):
 	if not txt:
 		return contacts
 
-	match = [d for d in contacts if (d.value and (txt in d.value or txt in d.description))]
+	match = [d for d in contacts if (d.value and ((d.value and txt in d.value) or (d.description and txt in d.description)))]
 	return match
 
 def update_contact_cache(contacts):

frappe/email/receive.py

@@ -481,7 +481,10 @@ def get_charset(self, part):
 		"""Detect chartset."""
 		charset = part.get_content_charset()
 		if not charset:
-			charset = chardet.detect(str(part))['encoding']
+			if six.PY2:
+				charset = chardet.detect(str(part))['encoding']
+			else:
+				charset = chardet.detect(part.encode())['encoding']
 
 		return charset
 

frappe/integrations/doctype/s3_backup_settings/s3_backup_settings.py

@@ -11,6 +11,7 @@
 from frappe.model.document import Document
 from frappe.utils import cint, split_emails
 from frappe.utils.background_jobs import enqueue
+from rq.timeouts import JobTimeoutException
 from botocore.exceptions import ClientError
 
 class S3BackupSettings(Document):
@@ -162,8 +163,9 @@ def delete_old_backups(limit, bucket):
 			)
 	bucket = s3.Bucket(bucket)
 	objects = bucket.meta.client.list_objects_v2(Bucket=bucket.name, Delimiter='/')
-	for obj in objects.get('CommonPrefixes'):
-		all_backups.append(obj.get('Prefix'))
+	if objects:
+		for obj in objects.get('CommonPrefixes'):
+			all_backups.append(obj.get('Prefix'))
 
 	oldest_backup = sorted(all_backups)[0]