Merge branch 'newsletter-fix' of https://github.com/anupamvs/frappe into newsletter-fix

.snyk

@@ -1,5 +1,5 @@
 # Snyk (https://snyk.io) policy file, patches or ignores known vulnerabilities.
-version: v1.14.1
+version: v1.19.0
 # ignores vulnerabilities until expiry date; change duration by modifying expiry date
 ignore:
   SNYK-JS-AWESOMPLETE-174474:
@@ -63,3 +63,5 @@ patch:
         patched: '2020-04-30T23:02:32.330Z'
     - snyk > @snyk/snyk-cocoapods-plugin > @snyk/cocoapods-lockfile-parser > @snyk/dep-graph > graphlib > lodash:
         patched: '2020-04-30T23:02:32.330Z'
+    - quill-image-resize > lodash:
+        patched: '2020-08-24T23:06:37.710Z'

frappe/model/base_document.py

@@ -299,7 +299,12 @@ class BaseDocument(object):
 		return frappe.as_json(self.as_dict())
 
 	def get_table_field_doctype(self, fieldname):
-		return self.meta.get_field(fieldname).options
+		try:
+			return self.meta.get_field(fieldname).options
+		except AttributeError:
+			if self.doctype == 'DocType':
+				return dict(links='DocType Link', actions='DocType Action').get(fieldname)
+			raise
 
 	def get_parentfield_of_doctype(self, doctype):
 		fieldname = [df.fieldname for df in self.meta.get_table_fields() if df.options==doctype]

frappe/model/utils/rename_field.py

@@ -19,11 +19,17 @@ def rename_field(doctype, old_fieldname, new_fieldname):
 		print("rename_field: " + (new_fieldname) + " not found in " + doctype)
 		return
 
+	if not meta.issingle and not frappe.db.has_column(doctype, old_fieldname):
+		print("rename_field: " + (old_fieldname) + " not found in table for: " + doctype)
+		# never had the field?
+		return
+
 	if new_field.fieldtype in table_fields:
 		# change parentfield of table mentioned in options
 		frappe.db.sql("""update `tab%s` set parentfield=%s
 			where parentfield=%s""" % (new_field.options.split("\n")[0], "%s", "%s"),
 			(new_fieldname, old_fieldname))
+
 	elif new_field.fieldtype not in no_value_fields:
 		if meta.issingle:
 			frappe.db.sql("""update `tabSingles` set field=%s

frappe/patches.txt

@@ -40,7 +40,9 @@ execute:frappe.reload_doc('core', 'doctype', 'role') #2017-05-23
 execute:frappe.reload_doc('core', 'doctype', 'user') #2017-10-27
 execute:frappe.reload_doc('custom', 'doctype', 'custom_field') #2015-10-19
 execute:frappe.reload_doc('core', 'doctype', 'page') #2013-13-26
-execute:frappe.reload_doc('core', 'doctype', 'report') #2014-06-03
+execute:frappe.reload_doc('core', 'doctype', 'report_column')
+execute:frappe.reload_doc('core', 'doctype', 'report_filter')
+execute:frappe.reload_doc('core', 'doctype', 'report') #2020-08-25
 execute:frappe.reload_doc('core', 'doctype', 'translation') #2016-03-03
 execute:frappe.reload_doc('email', 'doctype', 'email_alert') #2014-07-15
 execute:frappe.reload_doc('desk', 'doctype', 'todo') #2014-12-31-1

frappe/patches/v12_0/remove_deprecated_fields_from_doctype.py

@@ -1,6 +1,8 @@
 import frappe
 
 def execute():
+	frappe.reload_doc('core', 'doctype', 'doctype_link')
+	frappe.reload_doc('core', 'doctype', 'doctype_action')
 	frappe.reload_doc('core', 'doctype', 'doctype')
 	frappe.model.delete_fields({
 		'DocType': ['hide_heading', 'image_view', 'read_only_onload']

frappe/public/js/frappe/form/layout.js

@@ -525,7 +525,7 @@ frappe.ui.form.Layout = Class.extend({
 			return;
 		}
 
-		var parent = this.frm ? this.frm.doc : null;
+		var parent = this.frm ? this.frm.doc : this.doc || null;
 
 		if(typeof(expression) === 'boolean') {
 			out = expression;

frappe/utils/backups.py

@@ -41,6 +41,9 @@ class BackupGenerator:
 		self.backup_path_db = backup_path_db
 		self.backup_path_private_files = backup_path_private_files
 
+		if not self.db_type:
+			self.db_type = 'mariadb'
+
 		if not self.db_port and self.db_type == 'mariadb':
 			self.db_port = 3306
 		elif not self.db_port and self.db_type == 'postgres':

frappe/website/render.py

@@ -149,8 +149,8 @@ def add_preload_headers(response):
 			preload.append(("style", elem.get("href")))
 
 		links = []
-		for type, link in preload:
-			links.append("</{}>; rel=preload; as={}".format(link.lstrip("/"), type))
+		for _type, link in preload:
+			links.append("<{}>; rel=preload; as={}".format(link, _type))
 
 		if links:
 			response.headers["Link"] = ",".join(links)

package.json

@@ -43,7 +43,7 @@
     "qz-tray": "^2.0.8",
     "redis": "^2.8.0",
     "showdown": "^1.9.1",
-    "snyk": "^1.316.1",
+    "snyk": "^1.382.0",
     "socket.io": "^2.3.0",
     "superagent": "^3.8.2",
     "touch": "^3.1.0",