Merge pull request #1101 from anandpdoshi/anand-may-8

Extract images from children and page-body min-height

frappe/model/base_document.py

@@ -541,6 +541,12 @@ class BaseDocument(object):
 
 		return val
 
+	def _extract_images_from_text_editor(self):
+		from frappe.utils.file_manager import extract_images_from_html
+		if self.doctype != "DocType":
+			for df in self.meta.get("fields", {"fieldtype":"Text Editor"}):
+				extract_images_from_html(self, df.fieldname)
+
 def _filter(data, filters, limit=None):
 	"""pass filters as:
 		{"key": "val", "key": ["!=", "val"],

frappe/model/document.py

@@ -299,11 +299,15 @@ class Document(BaseDocument):
 		self._validate_links()
 		self._validate_selects()
 		self._validate_constants()
-		self._extract_images_from_text_editor()
 
-		for d in self.get_all_children():
+		children = self.get_all_children()
+		for d in children:
 			d._validate_selects()
 			d._validate_constants()
+
+		# extract images after validations to save processing if some validation error is raised
+		self._extract_images_from_text_editor()
+		for d in children:
 			d._extract_images_from_text_editor()
 
 	def validate_higher_perm_levels(self):
@@ -488,12 +492,6 @@ class Document(BaseDocument):
 				ret.extend(value)
 		return ret
 
-	def _extract_images_from_text_editor(self):
-		from frappe.utils.file_manager import extract_images_from_html
-		if self.doctype != "DocType":
-			for df in self.meta.get("fields", {"fieldtype":"Text Editor"}):
-				extract_images_from_html(self, df.fieldname)
-
 	def run_method(self, method, *args, **kwargs):
 		"""run standard triggers, plus those in hooks"""
 		if "flags" in kwargs:

frappe/public/css/page.css

@@ -20,6 +20,7 @@
 }
 .page-body {
   overflow-x: hidden;
+  min-height: calc(60vh);
 }
 .page-title h6 {
   margin-top: -8px;

frappe/public/less/page.less

@@ -26,6 +26,7 @@
 
 .page-body {
 	overflow-x: hidden;
+	min-height: calc(100vh - 40px);
 }
 
 .page-title {

frappe/utils/file_manager.py

@@ -98,15 +98,18 @@ def extract_images_from_html(doc, fieldname):
 			mtype = headers.split(";")[0]
 			filename = get_random_filename(content_type=mtype)
 
+		doctype = doc.parenttype if doc.parent else doc.doctype
+		name = doc.parent or doc.name
+
 		# TODO fix this
-		file_url = save_file(filename, content, doc.doctype, doc.name, decode=True).get("file_url")
+		file_url = save_file(filename, content, doctype, name, decode=True).get("file_url")
 		if not frappe.flags.has_dataurl:
 			frappe.flags.has_dataurl = True
 
 		return '<img src="{file_url}"'.format(file_url=file_url)
 
 	if content:
-		content = re.sub('<img\s*src=\s*["\'](?=data:)(.*?)["\']', _save_file, content)
+		content = re.sub('<img[^>]*src\s*=\s*["\'](?=data:)(.*?)["\']', _save_file, content)
 		if frappe.flags.has_dataurl:
 			doc.set(fieldname, content)