From f512fe8446f4fb8f9755099406a014ed0f04b8fd Mon Sep 17 00:00:00 2001
From: Himanshu Warekar <himanshuwarekar@yahoo.com>
Date: Thu, 7 May 2020 18:21:05 +0530
Subject: [PATCH 01/34] feat: help article feedback

---
 .../js/frappe/form/sidebar/form_sidebar.js    | 13 ++++
 .../frappe/form/templates/form_sidebar.html   |  6 +-
 frappe/public/js/frappe/utils/common.js       |  6 ++
 frappe/public/less/sidebar.less               |  3 +-
 frappe/templates/includes/feedback.html       | 29 +++++++++
 frappe/website/doctype/feedback/__init__.py   |  0
 frappe/website/doctype/feedback/feedback.js   |  8 +++
 frappe/website/doctype/feedback/feedback.json | 59 +++++++++++++++++++
 frappe/website/doctype/feedback/feedback.py   | 27 +++++++++
 .../website/doctype/feedback/test_feedback.py | 10 ++++
 .../help_article/templates/help_article.html  |  5 +-
 11 files changed, 163 insertions(+), 3 deletions(-)
 create mode 100644 frappe/templates/includes/feedback.html
 create mode 100644 frappe/website/doctype/feedback/__init__.py
 create mode 100644 frappe/website/doctype/feedback/feedback.js
 create mode 100644 frappe/website/doctype/feedback/feedback.json
 create mode 100644 frappe/website/doctype/feedback/feedback.py
 create mode 100644 frappe/website/doctype/feedback/test_feedback.py

diff --git a/frappe/public/js/frappe/form/sidebar/form_sidebar.js b/frappe/public/js/frappe/form/sidebar/form_sidebar.js
index a145e47149..9450fdc674 100644
--- a/frappe/public/js/frappe/form/sidebar/form_sidebar.js
+++ b/frappe/public/js/frappe/form/sidebar/form_sidebar.js
@@ -93,6 +93,19 @@ frappe.ui.form.Sidebar = Class.extend({
 				});
 			}
 
+			frappe.utils.get_feedback(this.frm.doc.name).then((res) => {
+				this.sidebar
+					.find(".helpful")
+					.html(
+						__("Helpful {0}", [String(res.message.helpful).bold()])
+					);
+				this.sidebar
+					.find(".not-helpful")
+					.html(
+						__("Not Helpful {0}", [String(res.message.not_helpful).bold()])
+					);
+			});
+
 			this.sidebar
 				.find(".modified-by")
 				.html(
diff --git a/frappe/public/js/frappe/form/templates/form_sidebar.html b/frappe/public/js/frappe/form/templates/form_sidebar.html
index 30b2205bae..3e72684818 100644
--- a/frappe/public/js/frappe/form/templates/form_sidebar.html
+++ b/frappe/public/js/frappe/form/templates/form_sidebar.html
@@ -106,11 +106,15 @@
 </ul>
 <ul class="list-unstyled sidebar-menu text-muted">
 	<li class="pageview-count"></li>
+	<li class="feedback">
+		<p class="helpful"></p>
+		<p class="not-helpful"></p>
+	</li>
 	<li class="modified-by"></li>
 	<li class="created-by"></li>
 </ul>
 {% if(frappe.get_form_sidebar_extension) { %}
-    {{ frappe.get_form_sidebar_extension() }}
+	{{ frappe.get_form_sidebar_extension() }}
 {% } %}
 <ul class="list-unstyled visible-xs visible-sm">
 
diff --git a/frappe/public/js/frappe/utils/common.js b/frappe/public/js/frappe/utils/common.js
index 1cdabf23e0..2fda8ed27a 100644
--- a/frappe/public/js/frappe/utils/common.js
+++ b/frappe/public/js/frappe/utils/common.js
@@ -359,3 +359,9 @@ frappe.utils.get_page_view_count = function(route) {
 		path: route
 	});
 };
+
+frappe.utils.get_feedback = function(reference_name) {
+	return frappe.call("frappe.website.doctype.feedback.feedback.get_feedback_count", {
+		reference_name: reference_name
+	});
+};
\ No newline at end of file
diff --git a/frappe/public/less/sidebar.less b/frappe/public/less/sidebar.less
index 109b7a3209..b6ffb7e697 100644
--- a/frappe/public/less/sidebar.less
+++ b/frappe/public/less/sidebar.less
@@ -274,7 +274,8 @@ body[data-route^="Module"] .main-menu {
 
 .layout-side-section .form-sidebar {
 	.modified-by,
-	.pageview-count {
+	.pageview-count,
+	.feedback {
 		margin-bottom: 15px;
 	}
 }
diff --git a/frappe/templates/includes/feedback.html b/frappe/templates/includes/feedback.html
new file mode 100644
index 0000000000..5d10c7b159
--- /dev/null
+++ b/frappe/templates/includes/feedback.html
@@ -0,0 +1,29 @@
+<div class="feedback-view mb-4">
+	<hr />
+	<span class="text-muted small">{{ _("Helpful?") }}</span>
+	<span class="small">
+		<a class="feedback btn btn-light btn-sm" data-value="Yes">{{ _("Yes") }}</a>
+		<a class="feedback btn btn-light btn-sm" data-value="No">{{ _("No") }}</a>
+	</span>
+</div>
+
+<script>
+	frappe.ready(function() {
+		$(".feedback").click(function() {
+			let args = {
+				reference_doctype: "{{ reference_doctype or doctype }}",
+				reference_name: "{{ reference_name or name }}",
+				helpful: this.getAttribute("data-value"),
+			}
+
+			frappe.call({
+				btn: this,
+				method: "frappe.website.doctype.feedback.feedback.add_feedback",
+				args: args,
+				callback: function(r) {
+					console.log(r);
+				}
+			})
+		})
+	});
+</script>
diff --git a/frappe/website/doctype/feedback/__init__.py b/frappe/website/doctype/feedback/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/frappe/website/doctype/feedback/feedback.js b/frappe/website/doctype/feedback/feedback.js
new file mode 100644
index 0000000000..f5fa89b30e
--- /dev/null
+++ b/frappe/website/doctype/feedback/feedback.js
@@ -0,0 +1,8 @@
+// Copyright (c) 2020, Frappe Technologies and contributors
+// For license information, please see license.txt
+
+frappe.ui.form.on('Feedback', {
+	// refresh: function(frm) {
+
+	// }
+});
diff --git a/frappe/website/doctype/feedback/feedback.json b/frappe/website/doctype/feedback/feedback.json
new file mode 100644
index 0000000000..b04aefa462
--- /dev/null
+++ b/frappe/website/doctype/feedback/feedback.json
@@ -0,0 +1,59 @@
+{
+ "actions": [],
+ "creation": "2020-05-07 16:42:27.234652",
+ "doctype": "DocType",
+ "editable_grid": 1,
+ "engine": "InnoDB",
+ "field_order": [
+  "reference_doctype",
+  "reference_name",
+  "helpful"
+ ],
+ "fields": [
+  {
+   "fieldname": "reference_doctype",
+   "fieldtype": "Link",
+   "label": "Reference DocType",
+   "options": "DocType"
+  },
+  {
+   "fieldname": "helpful",
+   "fieldtype": "Select",
+   "label": "Helpful",
+   "options": "Yes\nNo"
+  },
+  {
+   "fieldname": "reference_name",
+   "fieldtype": "Dynamic Link",
+   "label": "Reference Name",
+   "options": "reference_doctype",
+   "search_index": 1
+  }
+ ],
+ "in_create": 1,
+ "links": [],
+ "modified": "2020-05-07 16:53:29.211653",
+ "modified_by": "Administrator",
+ "module": "Website",
+ "name": "Feedback",
+ "owner": "Administrator",
+ "permissions": [
+  {
+   "create": 1,
+   "delete": 1,
+   "email": 1,
+   "export": 1,
+   "print": 1,
+   "read": 1,
+   "report": 1,
+   "role": "System Manager",
+   "share": 1,
+   "write": 1
+  }
+ ],
+ "quick_entry": 1,
+ "read_only": 1,
+ "sort_field": "modified",
+ "sort_order": "DESC",
+ "track_changes": 1
+}
\ No newline at end of file
diff --git a/frappe/website/doctype/feedback/feedback.py b/frappe/website/doctype/feedback/feedback.py
new file mode 100644
index 0000000000..3b92118ec3
--- /dev/null
+++ b/frappe/website/doctype/feedback/feedback.py
@@ -0,0 +1,27 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2020, Frappe Technologies and contributors
+# For license information, please see license.txt
+
+from __future__ import unicode_literals
+import frappe
+from frappe.model.document import Document
+
+class Feedback(Document):
+	pass
+
+@frappe.whitelist(allow_guest=True)
+def add_feedback(reference_doctype, reference_name, helpful):
+	frappe.get_doc({
+		"doctype": "Feedback",
+		"reference_doctype": reference_doctype,
+		"reference_name": reference_name,
+		"helpful": helpful
+	}).insert(ignore_permissions=True)
+
+@frappe.whitelist()
+def get_feedback_count(reference_name):
+
+	return {
+		"helpful": frappe.db.count("Feedback", {"reference_name": reference_name, "helpful": "Yes"}),
+		"not_helpful": frappe.db.count("Feedback", {"reference_name": reference_name, "helpful": "No"}),
+	}
\ No newline at end of file
diff --git a/frappe/website/doctype/feedback/test_feedback.py b/frappe/website/doctype/feedback/test_feedback.py
new file mode 100644
index 0000000000..9a31738d75
--- /dev/null
+++ b/frappe/website/doctype/feedback/test_feedback.py
@@ -0,0 +1,10 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2020, Frappe Technologies and Contributors
+# See license.txt
+from __future__ import unicode_literals
+
+# import frappe
+import unittest
+
+class TestFeedback(unittest.TestCase):
+	pass
diff --git a/frappe/website/doctype/help_article/templates/help_article.html b/frappe/website/doctype/help_article/templates/help_article.html
index 913e6d6a92..6c59359785 100644
--- a/frappe/website/doctype/help_article/templates/help_article.html
+++ b/frappe/website/doctype/help_article/templates/help_article.html
@@ -19,6 +19,9 @@
 	<p><br><a href="/{{ category.route }}" class='text-muted small'>
 		{{ _("More articles on {0}").format(category.name) }}</a></p>
 </article>
+<div class="help-article-feedback">
+	{% include 'templates/includes/feedback.html' %}
+</div>
 <div class="help-article-comments">
 	<hr>
 	<h4>Comments</h4>
@@ -26,7 +29,7 @@
 </div>
 <script>
 frappe.ready(function() {
-    frappe.set_search_path("/kb");
+	frappe.set_search_path("/kb");
 });
 </script>
 {% endblock %}

From c3a45de794a23f96ba208add27c518765d8c9d80 Mon Sep 17 00:00:00 2001
From: Himanshu Warekar <himanshuwarekar@yahoo.com>
Date: Fri, 8 May 2020 11:39:40 +0530
Subject: [PATCH 02/34] fix: feedback restrict to help article

---
 .../js/frappe/form/sidebar/form_sidebar.js    |  13 -
 .../frappe/form/templates/form_sidebar.html   |   4 -
 frappe/public/js/frappe/utils/common.js       |   6 -
 frappe/public/less/sidebar.less               |   3 +-
 frappe/templates/includes/feedback.html       |  29 -
 frappe/website/doctype/feedback/__init__.py   |   0
 frappe/website/doctype/feedback/feedback.js   |   8 -
 frappe/website/doctype/feedback/feedback.json |  59 --
 frappe/website/doctype/feedback/feedback.py   |  27 -
 .../website/doctype/feedback/test_feedback.py |  10 -
 .../doctype/help_article/help_article.js      |  15 +
 .../doctype/help_article/help_article.json    | 559 +++++-------------
 .../doctype/help_article/help_article.py      |  10 +-
 .../help_article/templates/help_article.html  |  26 +-
 14 files changed, 185 insertions(+), 584 deletions(-)
 delete mode 100644 frappe/templates/includes/feedback.html
 delete mode 100644 frappe/website/doctype/feedback/__init__.py
 delete mode 100644 frappe/website/doctype/feedback/feedback.js
 delete mode 100644 frappe/website/doctype/feedback/feedback.json
 delete mode 100644 frappe/website/doctype/feedback/feedback.py
 delete mode 100644 frappe/website/doctype/feedback/test_feedback.py

diff --git a/frappe/public/js/frappe/form/sidebar/form_sidebar.js b/frappe/public/js/frappe/form/sidebar/form_sidebar.js
index 9450fdc674..a145e47149 100644
--- a/frappe/public/js/frappe/form/sidebar/form_sidebar.js
+++ b/frappe/public/js/frappe/form/sidebar/form_sidebar.js
@@ -93,19 +93,6 @@ frappe.ui.form.Sidebar = Class.extend({
 				});
 			}
 
-			frappe.utils.get_feedback(this.frm.doc.name).then((res) => {
-				this.sidebar
-					.find(".helpful")
-					.html(
-						__("Helpful {0}", [String(res.message.helpful).bold()])
-					);
-				this.sidebar
-					.find(".not-helpful")
-					.html(
-						__("Not Helpful {0}", [String(res.message.not_helpful).bold()])
-					);
-			});
-
 			this.sidebar
 				.find(".modified-by")
 				.html(
diff --git a/frappe/public/js/frappe/form/templates/form_sidebar.html b/frappe/public/js/frappe/form/templates/form_sidebar.html
index 3e72684818..497a6488e2 100644
--- a/frappe/public/js/frappe/form/templates/form_sidebar.html
+++ b/frappe/public/js/frappe/form/templates/form_sidebar.html
@@ -106,10 +106,6 @@
 </ul>
 <ul class="list-unstyled sidebar-menu text-muted">
 	<li class="pageview-count"></li>
-	<li class="feedback">
-		<p class="helpful"></p>
-		<p class="not-helpful"></p>
-	</li>
 	<li class="modified-by"></li>
 	<li class="created-by"></li>
 </ul>
diff --git a/frappe/public/js/frappe/utils/common.js b/frappe/public/js/frappe/utils/common.js
index 2fda8ed27a..1cdabf23e0 100644
--- a/frappe/public/js/frappe/utils/common.js
+++ b/frappe/public/js/frappe/utils/common.js
@@ -359,9 +359,3 @@ frappe.utils.get_page_view_count = function(route) {
 		path: route
 	});
 };
-
-frappe.utils.get_feedback = function(reference_name) {
-	return frappe.call("frappe.website.doctype.feedback.feedback.get_feedback_count", {
-		reference_name: reference_name
-	});
-};
\ No newline at end of file
diff --git a/frappe/public/less/sidebar.less b/frappe/public/less/sidebar.less
index b6ffb7e697..109b7a3209 100644
--- a/frappe/public/less/sidebar.less
+++ b/frappe/public/less/sidebar.less
@@ -274,8 +274,7 @@ body[data-route^="Module"] .main-menu {
 
 .layout-side-section .form-sidebar {
 	.modified-by,
-	.pageview-count,
-	.feedback {
+	.pageview-count {
 		margin-bottom: 15px;
 	}
 }
diff --git a/frappe/templates/includes/feedback.html b/frappe/templates/includes/feedback.html
deleted file mode 100644
index 5d10c7b159..0000000000
--- a/frappe/templates/includes/feedback.html
+++ /dev/null
@@ -1,29 +0,0 @@
-<div class="feedback-view mb-4">
-	<hr />
-	<span class="text-muted small">{{ _("Helpful?") }}</span>
-	<span class="small">
-		<a class="feedback btn btn-light btn-sm" data-value="Yes">{{ _("Yes") }}</a>
-		<a class="feedback btn btn-light btn-sm" data-value="No">{{ _("No") }}</a>
-	</span>
-</div>
-
-<script>
-	frappe.ready(function() {
-		$(".feedback").click(function() {
-			let args = {
-				reference_doctype: "{{ reference_doctype or doctype }}",
-				reference_name: "{{ reference_name or name }}",
-				helpful: this.getAttribute("data-value"),
-			}
-
-			frappe.call({
-				btn: this,
-				method: "frappe.website.doctype.feedback.feedback.add_feedback",
-				args: args,
-				callback: function(r) {
-					console.log(r);
-				}
-			})
-		})
-	});
-</script>
diff --git a/frappe/website/doctype/feedback/__init__.py b/frappe/website/doctype/feedback/__init__.py
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/frappe/website/doctype/feedback/feedback.js b/frappe/website/doctype/feedback/feedback.js
deleted file mode 100644
index f5fa89b30e..0000000000
--- a/frappe/website/doctype/feedback/feedback.js
+++ /dev/null
@@ -1,8 +0,0 @@
-// Copyright (c) 2020, Frappe Technologies and contributors
-// For license information, please see license.txt
-
-frappe.ui.form.on('Feedback', {
-	// refresh: function(frm) {
-
-	// }
-});
diff --git a/frappe/website/doctype/feedback/feedback.json b/frappe/website/doctype/feedback/feedback.json
deleted file mode 100644
index b04aefa462..0000000000
--- a/frappe/website/doctype/feedback/feedback.json
+++ /dev/null
@@ -1,59 +0,0 @@
-{
- "actions": [],
- "creation": "2020-05-07 16:42:27.234652",
- "doctype": "DocType",
- "editable_grid": 1,
- "engine": "InnoDB",
- "field_order": [
-  "reference_doctype",
-  "reference_name",
-  "helpful"
- ],
- "fields": [
-  {
-   "fieldname": "reference_doctype",
-   "fieldtype": "Link",
-   "label": "Reference DocType",
-   "options": "DocType"
-  },
-  {
-   "fieldname": "helpful",
-   "fieldtype": "Select",
-   "label": "Helpful",
-   "options": "Yes\nNo"
-  },
-  {
-   "fieldname": "reference_name",
-   "fieldtype": "Dynamic Link",
-   "label": "Reference Name",
-   "options": "reference_doctype",
-   "search_index": 1
-  }
- ],
- "in_create": 1,
- "links": [],
- "modified": "2020-05-07 16:53:29.211653",
- "modified_by": "Administrator",
- "module": "Website",
- "name": "Feedback",
- "owner": "Administrator",
- "permissions": [
-  {
-   "create": 1,
-   "delete": 1,
-   "email": 1,
-   "export": 1,
-   "print": 1,
-   "read": 1,
-   "report": 1,
-   "role": "System Manager",
-   "share": 1,
-   "write": 1
-  }
- ],
- "quick_entry": 1,
- "read_only": 1,
- "sort_field": "modified",
- "sort_order": "DESC",
- "track_changes": 1
-}
\ No newline at end of file
diff --git a/frappe/website/doctype/feedback/feedback.py b/frappe/website/doctype/feedback/feedback.py
deleted file mode 100644
index 3b92118ec3..0000000000
--- a/frappe/website/doctype/feedback/feedback.py
+++ /dev/null
@@ -1,27 +0,0 @@
-# -*- coding: utf-8 -*-
-# Copyright (c) 2020, Frappe Technologies and contributors
-# For license information, please see license.txt
-
-from __future__ import unicode_literals
-import frappe
-from frappe.model.document import Document
-
-class Feedback(Document):
-	pass
-
-@frappe.whitelist(allow_guest=True)
-def add_feedback(reference_doctype, reference_name, helpful):
-	frappe.get_doc({
-		"doctype": "Feedback",
-		"reference_doctype": reference_doctype,
-		"reference_name": reference_name,
-		"helpful": helpful
-	}).insert(ignore_permissions=True)
-
-@frappe.whitelist()
-def get_feedback_count(reference_name):
-
-	return {
-		"helpful": frappe.db.count("Feedback", {"reference_name": reference_name, "helpful": "Yes"}),
-		"not_helpful": frappe.db.count("Feedback", {"reference_name": reference_name, "helpful": "No"}),
-	}
\ No newline at end of file
diff --git a/frappe/website/doctype/feedback/test_feedback.py b/frappe/website/doctype/feedback/test_feedback.py
deleted file mode 100644
index 9a31738d75..0000000000
--- a/frappe/website/doctype/feedback/test_feedback.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# -*- coding: utf-8 -*-
-# Copyright (c) 2020, Frappe Technologies and Contributors
-# See license.txt
-from __future__ import unicode_literals
-
-# import frappe
-import unittest
-
-class TestFeedback(unittest.TestCase):
-	pass
diff --git a/frappe/website/doctype/help_article/help_article.js b/frappe/website/doctype/help_article/help_article.js
index c56bda8e0b..0ca92aefbd 100644
--- a/frappe/website/doctype/help_article/help_article.js
+++ b/frappe/website/doctype/help_article/help_article.js
@@ -3,6 +3,21 @@
 
 frappe.ui.form.on('Help Article', {
 	refresh: function(frm) {
+		frm.dashboard.clear_headline();
 
+		frm.dashboard.set_headline_alert(`
+			<div class="row">
+				<div class="col-md-6 col-xs-12">
+					<span class="indicator whitespace-nowrap green">
+						<span>Helpful ${frm.doc.helpful}</span>
+					</span>
+				</div>
+				<div class="col-md-6 col-xs-12">
+					<span class="indicator whitespace-nowrap red">
+						<span>Not Helpful ${frm.doc.helpful}</span>
+					</span>
+				</div>
+			</div>
+		`);
 	}
 });
diff --git a/frappe/website/doctype/help_article/help_article.json b/frappe/website/doctype/help_article/help_article.json
index 5957333724..ca659692c6 100644
--- a/frappe/website/doctype/help_article/help_article.json
+++ b/frappe/website/doctype/help_article/help_article.json
@@ -1,445 +1,158 @@
 {
- "allow_copy": 0, 
- "allow_guest_to_view": 1, 
- "allow_import": 1, 
- "allow_rename": 0, 
- "beta": 0, 
- "creation": "2014-10-30 14:25:53.780105", 
- "custom": 0, 
- "docstatus": 0, 
- "doctype": "DocType", 
- "document_type": "", 
- "editable_grid": 0, 
+ "actions": [],
+ "allow_guest_to_view": 1,
+ "allow_import": 1,
+ "creation": "2014-10-30 14:25:53.780105",
+ "doctype": "DocType",
+ "field_order": [
+  "title",
+  "category",
+  "published",
+  "column_break_4",
+  "author",
+  "level",
+  "section_break_7",
+  "content",
+  "likes",
+  "route",
+  "owner",
+  "feedback",
+  "helpful",
+  "cb_00",
+  "not_helpful"
+ ],
  "fields": [
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "title", 
-   "fieldtype": "Data", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 1, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Title", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 1, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
+   "fieldname": "title",
+   "fieldtype": "Data",
+   "in_global_search": 1,
+   "label": "Title",
+   "reqd": 1,
+   "search_index": 1
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "category", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 1, 
-   "in_standard_filter": 1, 
-   "label": "Category", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Help Category", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 1, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
+   "fieldname": "category",
+   "fieldtype": "Link",
+   "in_list_view": 1,
+   "in_standard_filter": 1,
+   "label": "Category",
+   "options": "Help Category",
+   "reqd": 1
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "published", 
-   "fieldtype": "Check", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Published", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
+   "default": "0",
+   "fieldname": "published",
+   "fieldtype": "Check",
+   "label": "Published"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "column_break_4", 
-   "fieldtype": "Column Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
+   "fieldname": "column_break_4",
+   "fieldtype": "Column Break"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "default": "user_fullname", 
-   "fieldname": "author", 
-   "fieldtype": "Data", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Author", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
+   "default": "user_fullname",
+   "fieldname": "author",
+   "fieldtype": "Data",
+   "label": "Author"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "level", 
-   "fieldtype": "Select", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Level", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Beginner\nIntermediate\nExpert", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
+   "fieldname": "level",
+   "fieldtype": "Select",
+   "label": "Level",
+   "options": "Beginner\nIntermediate\nExpert"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "section_break_7", 
-   "fieldtype": "Section Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
+   "fieldname": "section_break_7",
+   "fieldtype": "Section Break"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "content", 
-   "fieldtype": "Text Editor", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 1, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Content", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 1, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
+   "fieldname": "content",
+   "fieldtype": "Text Editor",
+   "in_global_search": 1,
+   "label": "Content",
+   "reqd": 1
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "likes", 
-   "fieldtype": "Int", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Likes", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 1, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
+   "fieldname": "likes",
+   "fieldtype": "Int",
+   "label": "Likes",
+   "read_only": 1
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "route", 
-   "fieldtype": "Data", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 1, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Route", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
+   "fieldname": "route",
+   "fieldtype": "Data",
+   "in_global_search": 1,
+   "label": "Route"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "default": "user", 
-   "fieldname": "owner", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Owner", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "User", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
+   "default": "user",
+   "fieldname": "owner",
+   "fieldtype": "Link",
+   "label": "Owner",
+   "options": "User"
+  },
+  {
+   "collapsible": 1,
+   "fieldname": "feedback",
+   "fieldtype": "Section Break",
+   "label": "Feedback"
+  },
+  {
+   "default": "0",
+   "fieldname": "helpful",
+   "fieldtype": "Int",
+   "in_list_view": 1,
+   "label": "Helpful",
+   "read_only": 1
+  },
+  {
+   "fieldname": "cb_00",
+   "fieldtype": "Column Break"
+  },
+  {
+   "default": "0",
+   "fieldname": "not_helpful",
+   "fieldtype": "Data",
+   "in_list_view": 1,
+   "label": "Not Helpful",
+   "read_only": 1
   }
- ], 
- "has_web_view": 1, 
- "hide_heading": 0, 
- "hide_toolbar": 0, 
- "icon": "icon-file-alt", 
- "idx": 0, 
- "image_view": 0, 
- "in_create": 0, 
- "is_published_field": "published", 
- "is_submittable": 0, 
- "issingle": 0, 
- "istable": 0, 
- "max_attachments": 0, 
- "modified": "2018-05-18 17:49:52.912440", 
- "modified_by": "Administrator", 
- "module": "Website", 
- "name": "Help Article", 
- "name_case": "", 
- "owner": "Administrator", 
+ ],
+ "has_web_view": 1,
+ "icon": "icon-file-alt",
+ "is_published_field": "published",
+ "links": [],
+ "modified": "2020-05-08 10:48:19.997789",
+ "modified_by": "Administrator",
+ "module": "Website",
+ "name": "Help Article",
+ "owner": "Administrator",
  "permissions": [
   {
-   "amend": 0, 
-   "cancel": 0, 
-   "create": 1, 
-   "delete": 1, 
-   "email": 1, 
-   "export": 1, 
-   "if_owner": 0, 
-   "import": 1, 
-   "permlevel": 0, 
-   "print": 1, 
-   "read": 1, 
-   "report": 1, 
-   "role": "Knowledge Base Editor", 
-   "set_user_permissions": 0, 
-   "share": 0, 
-   "submit": 0, 
+   "create": 1,
+   "delete": 1,
+   "email": 1,
+   "export": 1,
+   "import": 1,
+   "print": 1,
+   "read": 1,
+   "report": 1,
+   "role": "Knowledge Base Editor",
    "write": 1
-  }, 
+  },
   {
-   "amend": 0, 
-   "cancel": 0, 
-   "create": 1, 
-   "delete": 0, 
-   "email": 0, 
-   "export": 0, 
-   "if_owner": 0, 
-   "import": 0, 
-   "permlevel": 0, 
-   "print": 0, 
-   "read": 1, 
-   "report": 0, 
-   "role": "Knowledge Base Contributor", 
-   "set_user_permissions": 0, 
-   "share": 0, 
-   "submit": 0, 
+   "create": 1,
+   "read": 1,
+   "role": "Knowledge Base Contributor",
    "write": 1
-  }, 
+  },
   {
-   "amend": 0, 
-   "cancel": 0, 
-   "create": 0, 
-   "delete": 0, 
-   "email": 0, 
-   "export": 0, 
-   "if_owner": 0, 
-   "import": 0, 
-   "permlevel": 0, 
-   "print": 0, 
-   "read": 1, 
-   "report": 0, 
-   "role": "Guest", 
-   "set_user_permissions": 0, 
-   "share": 0, 
-   "submit": 0, 
-   "write": 0
+   "read": 1,
+   "role": "Guest"
   }
- ], 
- "quick_entry": 0, 
- "read_only": 0, 
- "read_only_onload": 0, 
- "show_name_in_global_search": 0, 
- "sort_field": "modified", 
- "sort_order": "DESC", 
- "title_field": "title", 
- "track_changes": 1, 
- "track_seen": 0
+ ],
+ "sort_field": "modified",
+ "sort_order": "DESC",
+ "title_field": "title",
+ "track_changes": 1
 }
\ No newline at end of file
diff --git a/frappe/website/doctype/help_article/help_article.py b/frappe/website/doctype/help_article/help_article.py
index 6220d0aff5..fa26cfef99 100644
--- a/frappe/website/doctype/help_article/help_article.py
+++ b/frappe/website/doctype/help_article/help_article.py
@@ -4,7 +4,7 @@
 from __future__ import unicode_literals
 import frappe
 from frappe.website.website_generator import WebsiteGenerator
-from frappe.utils import is_markdown, markdown
+from frappe.utils import is_markdown, markdown, cint
 from frappe.website.utils import get_comment_list
 from frappe import _
 
@@ -100,3 +100,11 @@ def clear_website_cache(path=None):
 	frappe.cache().delete_value("knowledge_base:category_sidebar")
 	frappe.cache().delete_value("knowledge_base:faq")
 
+@frappe.whitelist(allow_guest=True)
+def add_feedback(article, helpful):
+	field = "helpful"
+	if helpful == "No":
+		field = "not_helpful"
+
+	value = cint(frappe.db.get_value("Help Article", article, field))
+	frappe.db.set_value("Help Article", article, field, value+1, update_modified=False)
\ No newline at end of file
diff --git a/frappe/website/doctype/help_article/templates/help_article.html b/frappe/website/doctype/help_article/templates/help_article.html
index 6c59359785..4f71117dea 100644
--- a/frappe/website/doctype/help_article/templates/help_article.html
+++ b/frappe/website/doctype/help_article/templates/help_article.html
@@ -19,8 +19,13 @@
 	<p><br><a href="/{{ category.route }}" class='text-muted small'>
 		{{ _("More articles on {0}").format(category.name) }}</a></p>
 </article>
-<div class="help-article-feedback">
-	{% include 'templates/includes/feedback.html' %}
+<div class="help-article-feedback mb-4">
+	<hr />
+	<div class="feedback-view ">
+		<span class="text-muted small" style="margin-right: 15px;">{{ _("Was this helpful?") }}</span>
+		<button class="feedback btn btn-light btn-sm" data-value="Yes" style="width: 50px;">{{ _("Yes") }}</button>
+		<button class="feedback btn btn-light btn-sm" data-value="No" style="width: 50px;">{{ _("No") }}</button>
+	</div>
 </div>
 <div class="help-article-comments">
 	<hr>
@@ -30,6 +35,23 @@
 <script>
 frappe.ready(function() {
 	frappe.set_search_path("/kb");
+	$(".feedback").click(function() {
+		let args = {
+			article: "{{ reference_name or name }}",
+			helpful: this.getAttribute("data-value"),
+		}
+
+		frappe.call({
+			btn: this,
+			method: "frappe.website.doctype.help_article.help_article.add_feedback",
+			args: args,
+			callback: function(r) {
+				$(".feedback")[0].disabled = true;
+				$(".feedback")[1].disabled = true;
+				frappe.msgprint(__("Feedback Submitted."));
+			}
+		})
+	});
 });
 </script>
 {% endblock %}

From 8c65d3581ebb634d913cc81a02dbda60fd278c4d Mon Sep 17 00:00:00 2001
From: Himanshu <himanshuwarekar@yahoo.com>
Date: Wed, 27 May 2020 13:39:29 +0530
Subject: [PATCH 03/34] Update
 frappe/website/doctype/help_article/templates/help_article.html

Co-authored-by: Prssanna Desai <prssud@gmail.com>
---
 frappe/website/doctype/help_article/templates/help_article.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frappe/website/doctype/help_article/templates/help_article.html b/frappe/website/doctype/help_article/templates/help_article.html
index 4f71117dea..08c8fa342d 100644
--- a/frappe/website/doctype/help_article/templates/help_article.html
+++ b/frappe/website/doctype/help_article/templates/help_article.html
@@ -48,7 +48,7 @@ frappe.ready(function() {
 			callback: function(r) {
 				$(".feedback")[0].disabled = true;
 				$(".feedback")[1].disabled = true;
-				frappe.msgprint(__("Feedback Submitted."));
+				frappe.msgprint(__("Thank you for your feedback!"));
 			}
 		})
 	});

From 86508e7617e9b9d448599b6298dacf83f840d136 Mon Sep 17 00:00:00 2001
From: Himanshu Warekar <himanshuwarekar@yahoo.com>
Date: Mon, 15 Jun 2020 14:53:30 +0530
Subject: [PATCH 04/34] fix: change to primary for button

---
 .../help_article/templates/help_article.html       | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/frappe/website/doctype/help_article/templates/help_article.html b/frappe/website/doctype/help_article/templates/help_article.html
index 08c8fa342d..01271af8b9 100644
--- a/frappe/website/doctype/help_article/templates/help_article.html
+++ b/frappe/website/doctype/help_article/templates/help_article.html
@@ -23,8 +23,8 @@
 	<hr />
 	<div class="feedback-view ">
 		<span class="text-muted small" style="margin-right: 15px;">{{ _("Was this helpful?") }}</span>
-		<button class="feedback btn btn-light btn-sm" data-value="Yes" style="width: 50px;">{{ _("Yes") }}</button>
-		<button class="feedback btn btn-light btn-sm" data-value="No" style="width: 50px;">{{ _("No") }}</button>
+		<button class="feedback btn btn-outline-primary btn-sm" data-value="Yes" style="width: 50px;">{{ _("Yes") }}</button>
+		<button class="feedback btn btn-outline-primary btn-sm" data-value="No" style="width: 50px;">{{ _("No") }}</button>
 	</div>
 </div>
 <div class="help-article-comments">
@@ -41,13 +41,19 @@ frappe.ready(function() {
 			helpful: this.getAttribute("data-value"),
 		}
 
+		let disable_button = function(btn) {
+			btn.classList.remove("btn-outline-primary");
+			btn.classList.add("btn-light");
+			btn.disabled = true
+		}
+
 		frappe.call({
 			btn: this,
 			method: "frappe.website.doctype.help_article.help_article.add_feedback",
 			args: args,
 			callback: function(r) {
-				$(".feedback")[0].disabled = true;
-				$(".feedback")[1].disabled = true;
+				disable_button($(".feedback")[0]);
+				disable_button($(".feedback")[1]);
 				frappe.msgprint(__("Thank you for your feedback!"));
 			}
 		})

From 0aceebd5507d088410354e6bf55acdc54667b816 Mon Sep 17 00:00:00 2001
From: Himanshu <himanshuwarekar@yahoo.com>
Date: Wed, 24 Jun 2020 10:52:03 +0530
Subject: [PATCH 05/34] Update
 frappe/website/doctype/help_article/help_article.js

Co-authored-by: Prssanna Desai <prssud@gmail.com>
---
 frappe/website/doctype/help_article/help_article.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frappe/website/doctype/help_article/help_article.js b/frappe/website/doctype/help_article/help_article.js
index 0ca92aefbd..0a87b22e2c 100644
--- a/frappe/website/doctype/help_article/help_article.js
+++ b/frappe/website/doctype/help_article/help_article.js
@@ -14,7 +14,7 @@ frappe.ui.form.on('Help Article', {
 				</div>
 				<div class="col-md-6 col-xs-12">
 					<span class="indicator whitespace-nowrap red">
-						<span>Not Helpful ${frm.doc.helpful}</span>
+						<span>Not Helpful ${frm.doc.not_helpful}</span>
 					</span>
 				</div>
 			</div>

From 249d04420b9e32e8543c02bf8879d321747df5ba Mon Sep 17 00:00:00 2001
From: Himanshu <himanshuwarekar@yahoo.com>
Date: Fri, 26 Jun 2020 13:28:15 +0530
Subject: [PATCH 06/34] Update
 frappe/website/doctype/help_article/templates/help_article.html

Co-authored-by: Shivam Mishra <scmmishra@users.noreply.github.com>
---
 frappe/website/doctype/help_article/templates/help_article.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frappe/website/doctype/help_article/templates/help_article.html b/frappe/website/doctype/help_article/templates/help_article.html
index 01271af8b9..cdd830295f 100644
--- a/frappe/website/doctype/help_article/templates/help_article.html
+++ b/frappe/website/doctype/help_article/templates/help_article.html
@@ -22,7 +22,7 @@
 <div class="help-article-feedback mb-4">
 	<hr />
 	<div class="feedback-view ">
-		<span class="text-muted small" style="margin-right: 15px;">{{ _("Was this helpful?") }}</span>
+		<span class="text-muted small mr-2">{{ _("Was this article helpful?") }}</span>
 		<button class="feedback btn btn-outline-primary btn-sm" data-value="Yes" style="width: 50px;">{{ _("Yes") }}</button>
 		<button class="feedback btn btn-outline-primary btn-sm" data-value="No" style="width: 50px;">{{ _("No") }}</button>
 	</div>

From 548a5fa41640e6bf7dff1e19c011146ddfa7e65e Mon Sep 17 00:00:00 2001
From: Himanshu Warekar <himanshuwarekar@yahoo.com>
Date: Fri, 26 Jun 2020 15:38:07 +0530
Subject: [PATCH 07/34] fix: add new disabled state

---
 .../help_article/templates/help_article.html        | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

diff --git a/frappe/website/doctype/help_article/templates/help_article.html b/frappe/website/doctype/help_article/templates/help_article.html
index cdd830295f..a97154847b 100644
--- a/frappe/website/doctype/help_article/templates/help_article.html
+++ b/frappe/website/doctype/help_article/templates/help_article.html
@@ -25,6 +25,7 @@
 		<span class="text-muted small mr-2">{{ _("Was this article helpful?") }}</span>
 		<button class="feedback btn btn-outline-primary btn-sm" data-value="Yes" style="width: 50px;">{{ _("Yes") }}</button>
 		<button class="feedback btn btn-outline-primary btn-sm" data-value="No" style="width: 50px;">{{ _("No") }}</button>
+		<button class="feedback-msg btn btn-sm disabled hide">{{ _("Thank you for your feedback!") }}</button>
 	</div>
 </div>
 <div class="help-article-comments">
@@ -41,20 +42,14 @@ frappe.ready(function() {
 			helpful: this.getAttribute("data-value"),
 		}
 
-		let disable_button = function(btn) {
-			btn.classList.remove("btn-outline-primary");
-			btn.classList.add("btn-light");
-			btn.disabled = true
-		}
-
 		frappe.call({
 			btn: this,
 			method: "frappe.website.doctype.help_article.help_article.add_feedback",
 			args: args,
 			callback: function(r) {
-				disable_button($(".feedback")[0]);
-				disable_button($(".feedback")[1]);
-				frappe.msgprint(__("Thank you for your feedback!"));
+				$(".feedback")[0].classList.add("hide");
+				$(".feedback")[1].classList.add("hide");
+				$(".feedback-msg")[0].classList.remove("hide");
 			}
 		})
 	});

From 8ddfd2344d6c7d8be3855d317602de2b7d2f8888 Mon Sep 17 00:00:00 2001
From: "Chinmay D. Pai" <chinmaydpai@gmail.com>
Date: Thu, 2 Jul 2020 12:53:16 +0530
Subject: [PATCH 08/34] chore: add search queries to whitelist

these functions are called through search widget and need to be
whitelisted to work

Signed-off-by: Chinmay D. Pai <chinmaydpai@gmail.com>
---
 frappe/contacts/address_and_contact.py     | 1 +
 frappe/contacts/doctype/address/address.py | 3 ++-
 frappe/contacts/doctype/contact/contact.py | 1 +
 3 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/frappe/contacts/address_and_contact.py b/frappe/contacts/address_and_contact.py
index 5a004f153b..51f13fb1a1 100644
--- a/frappe/contacts/address_and_contact.py
+++ b/frappe/contacts/address_and_contact.py
@@ -146,6 +146,7 @@ def delete_contact_and_address(doctype, docname):
 			if len(doc.links)==1:
 				doc.delete()
 
+@frappe.whitelist()
 def filter_dynamic_link_doctypes(doctype, txt, searchfield, start, page_len, filters):
 	if not txt: txt = ""
 
diff --git a/frappe/contacts/doctype/address/address.py b/frappe/contacts/doctype/address/address.py
index b85d578353..79bdb42931 100644
--- a/frappe/contacts/doctype/address/address.py
+++ b/frappe/contacts/doctype/address/address.py
@@ -230,6 +230,7 @@ def get_company_address(company):
 
 	return ret
 
+@frappe.whitelist()
 def address_query(doctype, txt, searchfield, start, page_len, filters):
 	from frappe.desk.reportview import get_match_cond
 
@@ -289,4 +290,4 @@ def get_condensed_address(doc):
 	return ", ".join([doc.get(d) for d in fields if doc.get(d)])
 
 def update_preferred_address(address, field):
-	frappe.db.set_value('Address', address, field, 0)
\ No newline at end of file
+	frappe.db.set_value('Address', address, field, 0)
diff --git a/frappe/contacts/doctype/contact/contact.py b/frappe/contacts/doctype/contact/contact.py
index 4cf209541c..598e186ee8 100644
--- a/frappe/contacts/doctype/contact/contact.py
+++ b/frappe/contacts/doctype/contact/contact.py
@@ -182,6 +182,7 @@ def update_contact(doc, method):
 		contact.flags.ignore_mandatory = True
 		contact.save(ignore_permissions=True)
 
+@frappe.whitelist()
 def contact_query(doctype, txt, searchfield, start, page_len, filters):
 	from frappe.desk.reportview import get_match_cond
 

From 338151a7e5e067ec3e566025b1c99b04621432e3 Mon Sep 17 00:00:00 2001
From: "Chinmay D. Pai" <chinmaydpai@gmail.com>
Date: Tue, 7 Jul 2020 11:22:37 +0530
Subject: [PATCH 09/34] fix: correctly format sql query

Signed-off-by: Chinmay D. Pai <chinmaydpai@gmail.com>
---
 frappe/contacts/doctype/contact/contact.py | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/frappe/contacts/doctype/contact/contact.py b/frappe/contacts/doctype/contact/contact.py
index 598e186ee8..e340c7e2d0 100644
--- a/frappe/contacts/doctype/contact/contact.py
+++ b/frappe/contacts/doctype/contact/contact.py
@@ -205,14 +205,14 @@ def contact_query(doctype, txt, searchfield, start, page_len, filters):
 			`tabDynamic Link`.parenttype = 'Contact' and
 			`tabDynamic Link`.link_doctype = %(link_doctype)s and
 			`tabDynamic Link`.link_name = %(link_name)s and
-			`tabContact`.`{key}` like %(txt)s
-			{mcond}
+			`tabContact`.`%(key)s` like %(txt)s
+			%(mcond)s
 		order by
 			if(locate(%(_txt)s, `tabContact`.name), locate(%(_txt)s, `tabContact`.name), 99999),
 			`tabContact`.idx desc, `tabContact`.name
-		limit %(start)s, %(page_len)s """.format(
-			mcond=get_match_cond(doctype),
-			key=searchfield), {
+		limit %(start)s, %(page_len)s """, {
+			'mcond': get_match_cond(doctype),
+			'key': searchfield,
 			'txt': '%' + txt + '%',
 			'_txt': txt.replace("%", ""),
 			'start': start,

From 36d1b5f0150799a08b5ca39c5efd35040e3a899d Mon Sep 17 00:00:00 2001
From: "Chinmay D. Pai" <chinmaydpai@gmail.com>
Date: Thu, 9 Jul 2020 12:27:39 +0530
Subject: [PATCH 10/34] fix: check if field exists in meta before executing
 query

Signed-off-by: Chinmay D. Pai <chinmaydpai@gmail.com>
---
 frappe/contacts/doctype/contact/contact.py | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/frappe/contacts/doctype/contact/contact.py b/frappe/contacts/doctype/contact/contact.py
index e340c7e2d0..4af4362aff 100644
--- a/frappe/contacts/doctype/contact/contact.py
+++ b/frappe/contacts/doctype/contact/contact.py
@@ -186,6 +186,9 @@ def update_contact(doc, method):
 def contact_query(doctype, txt, searchfield, start, page_len, filters):
 	from frappe.desk.reportview import get_match_cond
 
+	if not frappe.get_meta("Contact").get_field(searchfield):
+		return {}
+
 	link_doctype = filters.pop('link_doctype')
 	link_name = filters.pop('link_name')
 
@@ -205,14 +208,12 @@ def contact_query(doctype, txt, searchfield, start, page_len, filters):
 			`tabDynamic Link`.parenttype = 'Contact' and
 			`tabDynamic Link`.link_doctype = %(link_doctype)s and
 			`tabDynamic Link`.link_name = %(link_name)s and
-			`tabContact`.`%(key)s` like %(txt)s
-			%(mcond)s
+			`tabContact`.`{key}` like %(txt)s
+			{mcond}
 		order by
 			if(locate(%(_txt)s, `tabContact`.name), locate(%(_txt)s, `tabContact`.name), 99999),
 			`tabContact`.idx desc, `tabContact`.name
-		limit %(start)s, %(page_len)s """, {
-			'mcond': get_match_cond(doctype),
-			'key': searchfield,
+		limit %(start)s, %(page_len)s """.format(mcond=get_match_cond(doctype), key=searchfield), {
 			'txt': '%' + txt + '%',
 			'_txt': txt.replace("%", ""),
 			'start': start,

From 817b2488271ef109d4f53ecf4b1856ff3635892e Mon Sep 17 00:00:00 2001
From: Himanshu <himanshuwarekar@yahoo.com>
Date: Sat, 11 Jul 2020 17:34:28 +0530
Subject: [PATCH 11/34] Update
 frappe/website/doctype/help_article/templates/help_article.html

Co-authored-by: Prssanna Desai <prssud@gmail.com>
---
 frappe/website/doctype/help_article/templates/help_article.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frappe/website/doctype/help_article/templates/help_article.html b/frappe/website/doctype/help_article/templates/help_article.html
index a97154847b..bfe2bc4529 100644
--- a/frappe/website/doctype/help_article/templates/help_article.html
+++ b/frappe/website/doctype/help_article/templates/help_article.html
@@ -22,7 +22,7 @@
 <div class="help-article-feedback mb-4">
 	<hr />
 	<div class="feedback-view ">
-		<span class="text-muted small mr-2">{{ _("Was this article helpful?") }}</span>
+		<div class="text-muted small mr-2 mb-2">{{ _("Was this article helpful?") }}</div>
 		<button class="feedback btn btn-outline-primary btn-sm" data-value="Yes" style="width: 50px;">{{ _("Yes") }}</button>
 		<button class="feedback btn btn-outline-primary btn-sm" data-value="No" style="width: 50px;">{{ _("No") }}</button>
 		<button class="feedback-msg btn btn-sm disabled hide">{{ _("Thank you for your feedback!") }}</button>

From 44979d17f6762f069acca40fb0ac5063bd5df550 Mon Sep 17 00:00:00 2001
From: Himanshu <himanshuwarekar@yahoo.com>
Date: Sat, 11 Jul 2020 17:34:50 +0530
Subject: [PATCH 12/34] Update
 frappe/website/doctype/help_article/templates/help_article.html

Co-authored-by: Prssanna Desai <prssud@gmail.com>
---
 .../doctype/help_article/templates/help_article.html        | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/frappe/website/doctype/help_article/templates/help_article.html b/frappe/website/doctype/help_article/templates/help_article.html
index bfe2bc4529..577383858b 100644
--- a/frappe/website/doctype/help_article/templates/help_article.html
+++ b/frappe/website/doctype/help_article/templates/help_article.html
@@ -47,9 +47,9 @@ frappe.ready(function() {
 			method: "frappe.website.doctype.help_article.help_article.add_feedback",
 			args: args,
 			callback: function(r) {
-				$(".feedback")[0].classList.add("hide");
-				$(".feedback")[1].classList.add("hide");
-				$(".feedback-msg")[0].classList.remove("hide");
+				$(".feedback")[0].classList.add("hidden");
+				$(".feedback")[1].classList.add("hidden");
+				$(".feedback-msg")[0].classList.remove("hidden");
 			}
 		})
 	});

From 0e1a8006ff081494b4b5483357de01adcf85fd52 Mon Sep 17 00:00:00 2001
From: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
Date: Tue, 14 Jul 2020 12:56:12 +0530
Subject: [PATCH 13/34] fix: Return empty array

---
 frappe/contacts/doctype/contact/contact.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frappe/contacts/doctype/contact/contact.py b/frappe/contacts/doctype/contact/contact.py
index 4af4362aff..0cdd7c7fdd 100644
--- a/frappe/contacts/doctype/contact/contact.py
+++ b/frappe/contacts/doctype/contact/contact.py
@@ -187,7 +187,7 @@ def contact_query(doctype, txt, searchfield, start, page_len, filters):
 	from frappe.desk.reportview import get_match_cond
 
 	if not frappe.get_meta("Contact").get_field(searchfield):
-		return {}
+		return []
 
 	link_doctype = filters.pop('link_doctype')
 	link_name = filters.pop('link_name')

From dfbf453eec5b5ebe47cfbcaa1f70c44b3fff4148 Mon Sep 17 00:00:00 2001
From: Shivam Mishra <scm.mymail@gmail.com>
Date: Tue, 14 Jul 2020 21:58:04 +0530
Subject: [PATCH 14/34] fix: don't allow removing ID column

---
 frappe/public/js/frappe/views/reports/report_view.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/frappe/public/js/frappe/views/reports/report_view.js b/frappe/public/js/frappe/views/reports/report_view.js
index 9e7e5cbdd6..4ae61c6f96 100644
--- a/frappe/public/js/frappe/views/reports/report_view.js
+++ b/frappe/public/js/frappe/views/reports/report_view.js
@@ -768,10 +768,12 @@ frappe.views.ReportView = class ReportView extends frappe.views.ListView {
 		const index = this.fields.findIndex(f => column.field === f[0]);
 		if (index === -1) return;
 		const field = this.fields[index];
-		if (field[0] === 'name' && this.group_by === null) {
+
+		if (field[0] === 'name') {
 			this.refresh();
 			frappe.throw(__('Cannot remove ID field'));
 		}
+
 		this.fields.splice(index, 1);
 		this.build_fields();
 		this.setup_columns();

From 46b5cb587f67c1da58dcca2a255aaa0c8f58318a Mon Sep 17 00:00:00 2001
From: Shivam Mishra <scm.mymail@gmail.com>
Date: Tue, 14 Jul 2020 21:58:23 +0530
Subject: [PATCH 15/34] feat: don't show name field in pick columns

---
 frappe/public/js/frappe/views/reports/report_view.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frappe/public/js/frappe/views/reports/report_view.js b/frappe/public/js/frappe/views/reports/report_view.js
index 4ae61c6f96..95a3577698 100644
--- a/frappe/public/js/frappe/views/reports/report_view.js
+++ b/frappe/public/js/frappe/views/reports/report_view.js
@@ -852,7 +852,7 @@ frappe.views.ReportView = class ReportView extends frappe.views.ListView {
 			columns: 2,
 			options: columns[this.doctype]
 				.filter(df => {
-					return !df.hidden;
+					return !df.hidden && df.fieldname !== 'name';
 				})
 				.map(df => ({
 					label: __(df.label),

From 907411d33fbc0db7950df119f75acae28b83ae90 Mon Sep 17 00:00:00 2001
From: "Chinmay D. Pai" <chinmaydpai@gmail.com>
Date: Thu, 16 Jul 2020 15:33:04 +0530
Subject: [PATCH 16/34] fix: validate if field exists in meta before adding to
 query

Signed-off-by: Chinmay D. Pai <chinmaydpai@gmail.com>
---
 frappe/contacts/doctype/address/address.py | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/frappe/contacts/doctype/address/address.py b/frappe/contacts/doctype/address/address.py
index 79bdb42931..9c838eeb40 100644
--- a/frappe/contacts/doctype/address/address.py
+++ b/frappe/contacts/doctype/address/address.py
@@ -238,13 +238,14 @@ def address_query(doctype, txt, searchfield, start, page_len, filters):
 	link_name = filters.pop('link_name')
 
 	condition = ""
-	for fieldname, value in iteritems(filters):
-		condition += " and {field}={value}".format(
-			field=fieldname,
-			value=value
-		)
-
 	meta = frappe.get_meta("Address")
+	for fieldname, value in iteritems(filters):
+		if meta.get_field(fieldname) or fieldname in frappe.db.DEFAULT_COLUMNS:
+			condition += " and {field}={value}".format(
+				field=fieldname,
+				value=value
+			)
+
 	searchfields = meta.get_search_fields()
 
 	if searchfield:

From 1e6e305a3746c9aa7bec8cb907faf41c815a2aff Mon Sep 17 00:00:00 2001
From: "Chinmay D. Pai" <chinmaydpai@gmail.com>
Date: Thu, 16 Jul 2020 15:36:07 +0530
Subject: [PATCH 17/34] fix: check if searchfield exists in default columns

Signed-off-by: Chinmay D. Pai <chinmaydpai@gmail.com>
---
 frappe/contacts/doctype/contact/contact.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/frappe/contacts/doctype/contact/contact.py b/frappe/contacts/doctype/contact/contact.py
index 0cdd7c7fdd..5be2cd086c 100644
--- a/frappe/contacts/doctype/contact/contact.py
+++ b/frappe/contacts/doctype/contact/contact.py
@@ -186,7 +186,8 @@ def update_contact(doc, method):
 def contact_query(doctype, txt, searchfield, start, page_len, filters):
 	from frappe.desk.reportview import get_match_cond
 
-	if not frappe.get_meta("Contact").get_field(searchfield):
+	if not frappe.get_meta("Contact").get_field(searchfield)\
+		or searchfield not in frappe.db.DEFAULT_COLUMNS:
 		return []
 
 	link_doctype = filters.pop('link_doctype')

From 28399ba94b7436df9d2833328d0100b36303f60c Mon Sep 17 00:00:00 2001
From: "Chinmay D. Pai" <chinmaydpai@gmail.com>
Date: Thu, 16 Jul 2020 15:41:29 +0530
Subject: [PATCH 18/34] fix: check for searchfield in meta

Signed-off-by: Chinmay D. Pai <chinmaydpai@gmail.com>
---
 frappe/contacts/doctype/address/address.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/frappe/contacts/doctype/address/address.py b/frappe/contacts/doctype/address/address.py
index 9c838eeb40..4de92cfa57 100644
--- a/frappe/contacts/doctype/address/address.py
+++ b/frappe/contacts/doctype/address/address.py
@@ -248,7 +248,8 @@ def address_query(doctype, txt, searchfield, start, page_len, filters):
 
 	searchfields = meta.get_search_fields()
 
-	if searchfield:
+	if searchfield and (meta.get_field(searchfield)\
+				or searchfield in frappe.db.DEFAULT_COLUMNS):
 		searchfields.append(searchfield)
 
 	search_condition = ''

From 42daf5a905e763fb4f9c9c9209760a737ab1ed71 Mon Sep 17 00:00:00 2001
From: "Chinmay D. Pai" <chinmaydpai@gmail.com>
Date: Mon, 20 Jul 2020 19:05:43 +0530
Subject: [PATCH 19/34] chore: escape value and remove unused condition

Signed-off-by: Chinmay D. Pai <chinmaydpai@gmail.com>
---
 frappe/contacts/doctype/address/address.py | 3 +--
 frappe/contacts/doctype/contact/contact.py | 7 -------
 2 files changed, 1 insertion(+), 9 deletions(-)

diff --git a/frappe/contacts/doctype/address/address.py b/frappe/contacts/doctype/address/address.py
index 4de92cfa57..57dea8284c 100644
--- a/frappe/contacts/doctype/address/address.py
+++ b/frappe/contacts/doctype/address/address.py
@@ -243,8 +243,7 @@ def address_query(doctype, txt, searchfield, start, page_len, filters):
 		if meta.get_field(fieldname) or fieldname in frappe.db.DEFAULT_COLUMNS:
 			condition += " and {field}={value}".format(
 				field=fieldname,
-				value=value
-			)
+				value=frappe.db.escape(value))
 
 	searchfields = meta.get_search_fields()
 
diff --git a/frappe/contacts/doctype/contact/contact.py b/frappe/contacts/doctype/contact/contact.py
index 5be2cd086c..8240940d2f 100644
--- a/frappe/contacts/doctype/contact/contact.py
+++ b/frappe/contacts/doctype/contact/contact.py
@@ -193,13 +193,6 @@ def contact_query(doctype, txt, searchfield, start, page_len, filters):
 	link_doctype = filters.pop('link_doctype')
 	link_name = filters.pop('link_name')
 
-	condition = ""
-	for fieldname, value in iteritems(filters):
-		condition += " and {field}={value}".format(
-			field=fieldname,
-			value=value
-		)
-
 	return frappe.db.sql("""select
 			`tabContact`.name, `tabContact`.first_name, `tabContact`.last_name
 		from

From 2083224609f62b71b6e486dbe476be3e7783fb3c Mon Sep 17 00:00:00 2001
From: Abhishek Balam <abhishekbalam96@gmail.com>
Date: Tue, 21 Jul 2020 12:36:23 +0530
Subject: [PATCH 20/34] fix: add a confirmation dialog on enabling auto reply

Signed-off-by: Chinmay D. Pai <chinmaydpai@gmail.com>
---
 .../doctype/email_account/email_account.js     | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/frappe/email/doctype/email_account/email_account.js b/frappe/email/doctype/email_account/email_account.js
index 71f9cccb0d..83896e0af7 100644
--- a/frappe/email/doctype/email_account/email_account.js
+++ b/frappe/email/doctype/email_account/email_account.js
@@ -95,6 +95,11 @@ frappe.ui.form.on("Email Account", {
 	enable_incoming: function(frm) {
 		frm.doc.no_remaining = null; //perform full sync
 		//frm.set_df_property("append_to", "reqd", frm.doc.enable_incoming);
+		frm.trigger("warn_autoreply_on_incoming");
+	},
+
+	enable_auto_reply: function(frm) {
+		frm.trigger("warn_autoreply_on_incoming");
 	},
 
 	notify_if_unreplied: function(frm) {
@@ -184,7 +189,18 @@ frappe.ui.form.on("Email Account", {
 				read as well as unread message from server. This may also cause the duplication\
 				of Communication (emails).");
 			frappe.confirm(msg, null, function() {
-				frm.set_value("email_sync_option", "ALL");
+				frm.set_value("email_sync_option", "UNSEEN");
+			});
+		}
+	},
+
+	warn_autoreply_on_incoming: function(frm) {
+		if (frm.doc.enable_incoming && frm.doc.enable_auto_reply && frm.doc.__islocal) {
+			var msg = __("Enabling auto reply on an incoming email account will send automated replies \
+				to all the synchronized emails. Do you wish to continue?");
+			frappe.confirm(msg, null, function() {
+				frm.set_value("enable_auto_reply", 0);
+				frappe.show_alert({message: __("Disabled Auto Reply"), indicator: "blue"});
 			});
 		}
 	}

From e3ce17a0c9ec989bd9cd2eddc9b975777d2eecbb Mon Sep 17 00:00:00 2001
From: prssanna <prssud@gmail.com>
Date: Tue, 21 Jul 2020 17:16:19 +0530
Subject: [PATCH 21/34] fix: check if dynamic filters exists

---
 frappe/desk/doctype/dashboard_chart/dashboard_chart.js | 2 +-
 frappe/desk/doctype/number_card/number_card.js         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/frappe/desk/doctype/dashboard_chart/dashboard_chart.js b/frappe/desk/doctype/dashboard_chart/dashboard_chart.js
index 6d33d7717b..ee6eb3289d 100644
--- a/frappe/desk/doctype/dashboard_chart/dashboard_chart.js
+++ b/frappe/desk/doctype/dashboard_chart/dashboard_chart.js
@@ -176,7 +176,7 @@ frappe.ui.form.on('Dashboard Chart', {
 
 	set_chart_field_options: function(frm) {
 		let filters = frm.doc.filters_json.length > 2 ? JSON.parse(frm.doc.filters_json) : null;
-		if (frm.doc.dynamic_filters_json.length > 2) {
+		if (frm.doc.dynamic_filters_json && frm.doc.dynamic_filters_json.length > 2) {
 			filters = frappe.dashboard_utils.get_all_filters(frm.doc);
 		}
 		frappe.xcall(
diff --git a/frappe/desk/doctype/number_card/number_card.js b/frappe/desk/doctype/number_card/number_card.js
index 8e05a28783..42899a4ebb 100644
--- a/frappe/desk/doctype/number_card/number_card.js
+++ b/frappe/desk/doctype/number_card/number_card.js
@@ -215,7 +215,7 @@ frappe.ui.form.on('Number Card', {
 
 	set_report_field_options: function(frm) {
 		let filters = frm.doc.filters_json.length > 2 ? JSON.parse(frm.doc.filters_json) : null;
-		if (frm.doc.dynamic_filters_json.length > 2) {
+		if (frm.doc.dynamic_filters_json && frm.doc.dynamic_filters_json.length > 2) {
 			filters = frappe.dashboard_utils.get_all_filters(frm.doc);
 		}
 		frappe.xcall(

From 48b835c1dc3757e7be6e741489b26916debe15a5 Mon Sep 17 00:00:00 2001
From: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
Date: Tue, 21 Jul 2020 18:26:42 +0530
Subject: [PATCH 22/34] fix: Text editor content style in email and website
 (#11003)

---
 frappe/public/css/email.css                     |  6 ++++++
 .../js/frappe/form/controls/text_editor.js      |  5 ++++-
 frappe/public/js/frappe/form/formatters.js      |  7 ++++++-
 frappe/public/less/email.less                   |  9 ++++++++-
 frappe/public/less/quill.less                   |  6 +++++-
 frappe/public/scss/website.scss                 | 17 ++++++++++++++++-
 .../print_formats/standard_macros.html          |  2 --
 7 files changed, 45 insertions(+), 7 deletions(-)

diff --git a/frappe/public/css/email.css b/frappe/public/css/email.css
index 40c6149927..5c398009ff 100644
--- a/frappe/public/css/email.css
+++ b/frappe/public/css/email.css
@@ -7,6 +7,12 @@ body {
 p {
   margin: 1em 0 !important;
 }
+.ql-editor {
+  white-space: normal;
+}
+.ql-editor p {
+  margin: 0 !important;
+}
 hr {
   border-top: 1px solid #d1d8dd;
 }
diff --git a/frappe/public/js/frappe/form/controls/text_editor.js b/frappe/public/js/frappe/form/controls/text_editor.js
index e367989b81..3fe0b60ae0 100644
--- a/frappe/public/js/frappe/form/controls/text_editor.js
+++ b/frappe/public/js/frappe/form/controls/text_editor.js
@@ -69,7 +69,6 @@ Quill.register(CustomColor, true);
 frappe.ui.form.ControlTextEditor = frappe.ui.form.ControlCode.extend({
 	make_wrapper() {
 		this._super();
-		this.$wrapper.find(".like-disabled-input").addClass('ql-editor');
 	},
 
 	make_input() {
@@ -201,6 +200,10 @@ frappe.ui.form.ControlTextEditor = frappe.ui.form.ControlCode.extend({
 		let value = this.quill ? this.quill.root.innerHTML : '';
 		// hack to retain space sequence.
 		value = value.replace(/(\s)(\s)/g, ' &nbsp;');
+
+		if (!$(value).find('.ql-editor').length) {
+			value = `<div class="ql-editor read-mode">${value}</div>`;
+		}
 		return value;
 	},
 
diff --git a/frappe/public/js/frappe/form/formatters.js b/frappe/public/js/frappe/form/formatters.js
index 4f9dd377c9..a7adc9175a 100644
--- a/frappe/public/js/frappe/form/formatters.js
+++ b/frappe/public/js/frappe/form/formatters.js
@@ -228,7 +228,12 @@ frappe.form.formatters = {
 		return frappe.form.formatters.Text(value);
 	},
 	TextEditor: function(value) {
-		return frappe.form.formatters.Text(value);
+		let formatted_value = frappe.form.formatters.Text(value);
+		// to use ql-editor styles
+		if (!$(formatted_value).find('.ql-editor').length) {
+			formatted_value = `<div class="ql-editor read-mode">${formatted_value}</div>`;
+		}
+		return formatted_value;
 	},
 	Code: function(value) {
 		return "<pre>" + (value==null ? "" : $("<div>").text(value).html()) + "</pre>"
diff --git a/frappe/public/less/email.less b/frappe/public/less/email.less
index b6d9540586..bf0507138b 100644
--- a/frappe/public/less/email.less
+++ b/frappe/public/less/email.less
@@ -10,6 +10,13 @@ p {
 	margin: 1em 0 !important;
 }
 
+.ql-editor {
+	white-space: normal;
+	p {
+		margin: 0 !important;
+	}
+}
+
 hr {
 	border-top: 1px solid @border-color;
 }
@@ -210,4 +217,4 @@ hr {
 .report-title {
 	margin-bottom: 20px;
 }
-/* csslint ignore:end */
+/* csslint ignore:end */
\ No newline at end of file
diff --git a/frappe/public/less/quill.less b/frappe/public/less/quill.less
index 98c762bb4a..514d8993cd 100644
--- a/frappe/public/less/quill.less
+++ b/frappe/public/less/quill.less
@@ -78,7 +78,7 @@
 	}
 }
 
-.ql-editor .mention {
+.ql-editor:not(.read-mode) .mention {
 	height: auto;
 	width: auto;
 	border-radius: 10px;
@@ -133,3 +133,7 @@
 	margin-top: 0px;
 	margin-bottom: 0px;
 }
+
+.ql-editor.read-mode {
+	padding: 0;
+}
\ No newline at end of file
diff --git a/frappe/public/scss/website.scss b/frappe/public/scss/website.scss
index c89641b238..3c11d23252 100644
--- a/frappe/public/scss/website.scss
+++ b/frappe/public/scss/website.scss
@@ -1,3 +1,4 @@
+@import '~quill/dist/quill.core';
 @import 'variables';
 @import 'frappe/public/css/font-awesome';
 @import '~bootstrap/scss/bootstrap';
@@ -11,6 +12,20 @@
 @import 'portal';
 @import 'doc';
 
+.ql-editor.read-mode {
+	padding: 0;
+	line-height: 1.6;
+
+	h1,
+	h2,
+	h3,
+	h4,
+	h5 {
+		margin-top: 0.5em;
+		margin-bottom: 0.25em;
+	}
+}
+
 .container {
 	padding-left: 1.25rem;
 	padding-right: 1.25rem;
@@ -338,4 +353,4 @@ h5.modal-title {
 	overflow: hidden;
 	white-space: nowrap;
 	text-overflow: ellipsis;
-}
\ No newline at end of file
+}
diff --git a/frappe/templates/print_formats/standard_macros.html b/frappe/templates/print_formats/standard_macros.html
index 07ef577aa7..3681a87f53 100644
--- a/frappe/templates/print_formats/standard_macros.html
+++ b/frappe/templates/print_formats/standard_macros.html
@@ -99,9 +99,7 @@ data-fieldname="{{ df.fieldname }}" data-fieldtype="{{ df.fieldtype }}"
 	{%- if df.fieldtype=="Code" %}
 		<pre class="value">{{ doc.get(df.fieldname) }}</pre>
 	{% else -%}
-		{%- if df.fieldtype=="Text Editor" -%}<div class='ql-editor'>{%- endif -%}
 		{{ doc.get_formatted(df.fieldname, parent_doc or doc, translated=df.translatable) }}
-		{%- if df.fieldtype=="Text Editor" -%}</div>{%- endif -%}
   {% endif -%}
 </div>
 {%- endif -%}

From 547bd77c207e2f1668de43889e540edb7d4a36c2 Mon Sep 17 00:00:00 2001
From: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
Date: Tue, 21 Jul 2020 18:46:51 +0530
Subject: [PATCH 23/34] fix: Do not check all attachments on adding new
 (#10926)

---
 .../public/js/frappe/views/communication.js   | 129 ++++++++----------
 1 file changed, 59 insertions(+), 70 deletions(-)

diff --git a/frappe/public/js/frappe/views/communication.js b/frappe/public/js/frappe/views/communication.js
index 53d946f75d..29b21242af 100755
--- a/frappe/public/js/frappe/views/communication.js
+++ b/frappe/public/js/frappe/views/communication.js
@@ -44,26 +44,6 @@ frappe.views.CommunicationComposer = Class.extend({
 			}
 		});
 
-		$(document).on("upload_complete", function(event, attachment) {
-			if(me.dialog.display) {
-				var wrapper = $(me.dialog.fields_dict.select_attachments.wrapper);
-
-				// find already checked items
-				var checked_items = wrapper.find('[data-file-name]:checked').map(function() {
-					return $(this).attr("data-file-name");
-				});
-
-				// reset attachment list
-				me.render_attach();
-
-				// check latest added
-				checked_items.push(attachment.name);
-
-				$.each(checked_items, function(i, filename) {
-					wrapper.find('[data-file-name="'+ filename +'"]').prop("checked", true);
-				});
-			}
-		})
 		this.prepare();
 		this.dialog.show();
 
@@ -387,77 +367,86 @@ frappe.views.CommunicationComposer = Class.extend({
 			folder: 'Home/Attachments',
 			on_success: attachment => {
 				this.attachments.push(attachment);
-				this.render_attach();
+				this.render_attachment_rows(attachment);
 			}
 		};
 
-		if(this.frm) {
+		if (this.frm) {
 			args = {
 				doctype: this.frm.doctype,
 				docname: this.frm.docname,
 				folder: 'Home/Attachments',
 				on_success: attachment => {
 					this.frm.attachments.attachment_uploaded(attachment);
-					this.render_attach();
+					this.render_attachment_rows(attachment);
 				}
-			}
+			};
 		}
 
-		$("<h6 class='text-muted add-attachment' style='margin-top: 12px; cursor:pointer;'>"
-			+__("Select Attachments")+"</h6><div class='attach-list'></div>\
-			<p class='add-more-attachments'>\
-			<a class='text-muted small'><i class='octicon octicon-plus' style='font-size: 12px'></i> "
-			+__("Add Attachment")+"</a></p>").appendTo(attach.empty())
+		$(`
+			<h6 class='text-muted add-attachment' style='margin-top: 12px; cursor:pointer;'>
+				${__("Select Attachments")}
+			</h6>
+			<div class='attach-list'></div>
+			<p class='add-more-attachments'>
+				<a class='text-muted small'>
+					<i class='octicon octicon-plus' style='font-size: 12px'></i>
+					${__("Add Attachment")}
+				</a>
+			</p>
+		`).appendTo(attach.empty());
+
 		attach
 			.find(".add-more-attachments a")
-			.on('click',() => new frappe.ui.FileUploader(args));
-		this.render_attach();
+			.on('click', () => new frappe.ui.FileUploader(args));
+		this.render_attachment_rows();
 	},
-	render_attach:function(){
-		var fields = this.dialog.fields_dict;
-		var attach = $(fields.select_attachments.wrapper).find(".attach-list").empty();
 
-		var files = [];
-		if (this.attachments && this.attachments.length) {
-			files = files.concat(this.attachments);
-		}
-		if (cur_frm) {
-			files = files.concat(cur_frm.get_files());
-		}
+	render_attachment_rows: function(attachment) {
+		const select_attachments = this.dialog.fields_dict.select_attachments;
+		const attachment_rows = $(select_attachments.wrapper).find(".attach-list");
+		if (attachment) {
+			attachment_rows.append(this.get_attachment_row(attachment, true));
+		} else {
+			let files = [];
+			if (this.attachments && this.attachments.length) {
+				files = files.concat(this.attachments);
+			}
+			if (this.frm) {
+				files = files.concat(this.frm.get_files());
+			}
 
-		if(files.length) {
-			$.each(files, function(i, f) {
-				if (!f.file_name) return;
-				f.file_url = frappe.urllib.get_full_url(f.file_url);
-
-				$(repl('<p class="checkbox">'
-					+	'<label><span><input type="checkbox" data-file-name="%(name)s"></input></span>'
-					+		'<span class="small">%(file_name)s</span>'
-					+	' <a href="%(file_url)s" target="_blank" class="text-muted small">'
-					+		'<i class="fa fa-share" style="vertical-align: middle; margin-left: 3px;"></i>'
-					+ '</label></p>', f))
-					.appendTo(attach)
-			});
-		}
-		this.select_attachments();
-	},
-	select_attachments:function(){
-		let me = this;
-		if(me.dialog.display) {
-			let wrapper = $(me.dialog.fields_dict.select_attachments.wrapper);
-
-			let unchecked_items = wrapper.find('[data-file-name]:not(:checked)').map(function() {
-				return $(this).attr("data-file-name");
-			});
-
-			$.each(unchecked_items, function(i, filename) {
-				wrapper.find('[data-file-name="'+ filename +'"]').prop("checked", true);
-			});
+			if (files.length) {
+				$.each(files, (i, f) => {
+					if (!f.file_name) return;
+					if (!attachment_rows.find(`[data-file-name="${f.name}"]`).length) {
+						f.file_url = frappe.urllib.get_full_url(f.file_url);
+						attachment_rows.append(this.get_attachment_row(f));
+					}
+				});
+			}
 		}
 	},
+
+	get_attachment_row(attachment, checked) {
+		return $(`<p class="checkbox">
+			<label>
+				<span>
+					<input
+						type="checkbox"
+						data-file-name="${attachment.name}"
+						${checked ? 'checked': ''}>
+					</input>
+				</span>
+				<span class="small">${attachment.file_name}</span>
+				<a href="${attachment.file_url}" target="_blank" class="text-muted small">
+				<i class="fa fa-share" style="vertical-align: middle; margin-left: 3px;"></i>
+			</label>
+		</p>`);
+	},
+
 	setup_email: function() {
 		// email
-		var me = this;
 		var fields = this.dialog.fields_dict;
 
 		if(this.attach_document_print) {

From 061c8d90886d319dea9b8fa6c8c13741b08e3640 Mon Sep 17 00:00:00 2001
From: Diksha Jadhav <dikshajadhav11.dj@gmail.com>
Date: Tue, 21 Jul 2020 19:14:07 +0530
Subject: [PATCH 24/34] fix(grid): trigger onchange on field

---
 frappe/public/js/frappe/form/grid_row.js | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/frappe/public/js/frappe/form/grid_row.js b/frappe/public/js/frappe/form/grid_row.js
index f5a06311e9..f4bcecc68e 100644
--- a/frappe/public/js/frappe/form/grid_row.js
+++ b/frappe/public/js/frappe/form/grid_row.js
@@ -392,8 +392,11 @@ export default class GridRow {
 
 		// sync get_query
 		field.get_query = this.grid.get_field(df.fieldname).get_query;
-		field.df.onchange = function() {
-			me.grid.grid_rows[this.doc.idx-1].refresh_field(this.df.fieldname);
+
+		var field_on_change_function = field.df.onchange;
+		field.df.onchange = function(e) {
+			field_on_change_function && field_on_change_function(e);
+			me.grid.grid_rows[this.doc.idx - 1].refresh_field(this.df.fieldname);
 		};
 		field.refresh();
 		if(field.$input) {

From 06788762d60cad293c7ad34dc7525bed8aab6da4 Mon Sep 17 00:00:00 2001
From: Suraj Shetty <surajshetty3416@gmail.com>
Date: Wed, 22 Jul 2020 10:09:58 +0530
Subject: [PATCH 25/34] fix(website): Properly load colocated javascript and
 style

---
 frappe/templates/base.html | 12 ++++++++++--
 frappe/website/router.py   | 28 +++++++++++++---------------
 2 files changed, 23 insertions(+), 17 deletions(-)

diff --git a/frappe/templates/base.html b/frappe/templates/base.html
index 0b82b3dac2..8c843a44a4 100644
--- a/frappe/templates/base.html
+++ b/frappe/templates/base.html
@@ -42,7 +42,11 @@
 		{{ head_include or "" }}
 	{% endblock -%}
 
-	{%- block style %}{%- endblock -%}
+	{%- block style %}
+		{% if colocated_css -%}
+			<style>{{ colocated_css }}</style>
+		{%- endif %}
+	{%- endblock -%}
 
 	<script>
 		window.frappe = {};
@@ -86,7 +90,11 @@
 	<script type="text/javascript" src="{{ link | abs_url }}"></script>
 	{%- endfor -%}
 
-	{%- block script %}{%- endblock %}
+	{%- block script %}
+		{% if colocated_js -%}
+			<script>{{ colocated_js }}</script>
+		{%- endif %}
+	{%- endblock %}
 	<!-- csrf_token -->
 	{%- block body_include %}{{ body_include or "" }}{% endblock -%}
 </body>
diff --git a/frappe/website/router.py b/frappe/website/router.py
index db7e6f322c..fb9cae7d76 100644
--- a/frappe/website/router.py
+++ b/frappe/website/router.py
@@ -283,22 +283,20 @@ def setup_source(page_info):
 		# set the source only if it contains raw content
 		html = source
 
-		# load css/js files
-		js, css = '', ''
+	# load css/js files
+	js_path = os.path.join(page_info.basepath, (page_info.basename or 'index') + '.js')
+	if os.path.exists(js_path):
+		if not '{% block script %}' in html:
+			with io.open(js_path, 'r', encoding = 'utf-8') as f:
+				js = f.read()
+				page_info.colocated_js = js
 
-		js_path = os.path.join(page_info.basepath, (page_info.basename or 'index') + '.js')
-		if os.path.exists(js_path):
-			if not '{% block script %}' in html:
-				with io.open(js_path, 'r', encoding = 'utf-8') as f:
-					js = f.read()
-				html += '\n{% block script %}<script>' + js + '\n</script>\n{% endblock %}'
-
-		css_path = os.path.join(page_info.basepath, (page_info.basename or 'index') + '.css')
-		if os.path.exists(css_path):
-			if not '{% block style %}' in html:
-				with io.open(css_path, 'r', encoding='utf-8') as f:
-					css = f.read()
-				html += '\n{% block style %}\n<style>\n' + css + '\n</style>\n{% endblock %}'
+	css_path = os.path.join(page_info.basepath, (page_info.basename or 'index') + '.css')
+	if os.path.exists(css_path):
+		if not '{% block style %}' in html:
+			with io.open(css_path, 'r', encoding='utf-8') as f:
+				css = f.read()
+				page_info.colocated_css = css
 
 	if html:
 		page_info.source = html

From 2bf77cd82a3c14976cf4fe2fcd4073978338f4f0 Mon Sep 17 00:00:00 2001
From: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
Date: Wed, 22 Jul 2020 10:32:12 +0530
Subject: [PATCH 26/34] style: Fix sider

---
 frappe/website/router.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/frappe/website/router.py b/frappe/website/router.py
index fb9cae7d76..9a647e1030 100644
--- a/frappe/website/router.py
+++ b/frappe/website/router.py
@@ -286,14 +286,14 @@ def setup_source(page_info):
 	# load css/js files
 	js_path = os.path.join(page_info.basepath, (page_info.basename or 'index') + '.js')
 	if os.path.exists(js_path):
-		if not '{% block script %}' in html:
+		if '{% block script %}' not in html:
 			with io.open(js_path, 'r', encoding = 'utf-8') as f:
 				js = f.read()
 				page_info.colocated_js = js
 
 	css_path = os.path.join(page_info.basepath, (page_info.basename or 'index') + '.css')
 	if os.path.exists(css_path):
-		if not '{% block style %}' in html:
+		if '{% block style %}' not in html:
 			with io.open(css_path, 'r', encoding='utf-8') as f:
 				css = f.read()
 				page_info.colocated_css = css

From 2a068bad19a1fcae28921c9e4fd494b6209be527 Mon Sep 17 00:00:00 2001
From: Shivam Mishra <scm.mymail@gmail.com>
Date: Wed, 22 Jul 2020 11:17:04 +0530
Subject: [PATCH 27/34] fix: set page actions after setting read only

---
 frappe/public/js/frappe/form/form.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/frappe/public/js/frappe/form/form.js b/frappe/public/js/frappe/form/form.js
index c0b76ee94d..43128065bc 100644
--- a/frappe/public/js/frappe/form/form.js
+++ b/frappe/public/js/frappe/form/form.js
@@ -1409,6 +1409,7 @@ frappe.ui.form.Form = class FrappeForm {
 			};
 		}
 		this.perm = perm;
+		this.toolbar.set_page_action();
 	}
 
 	trigger(event, doctype, docname) {

From 8f6329de4953f99637c98c68ad94645560b51a73 Mon Sep 17 00:00:00 2001
From: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
Date: Wed, 22 Jul 2020 11:23:35 +0530
Subject: [PATCH 28/34] refactor: Simplify code

---
 frappe/website/router.py | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/frappe/website/router.py b/frappe/website/router.py
index 9a647e1030..263d5b0f07 100644
--- a/frappe/website/router.py
+++ b/frappe/website/router.py
@@ -285,18 +285,16 @@ def setup_source(page_info):
 
 	# load css/js files
 	js_path = os.path.join(page_info.basepath, (page_info.basename or 'index') + '.js')
-	if os.path.exists(js_path):
-		if '{% block script %}' not in html:
-			with io.open(js_path, 'r', encoding = 'utf-8') as f:
-				js = f.read()
-				page_info.colocated_js = js
+	if os.path.exists(js_path) and '{% block script %}' not in html:
+		with io.open(js_path, 'r', encoding = 'utf-8') as f:
+			js = f.read()
+			page_info.colocated_js = js
 
 	css_path = os.path.join(page_info.basepath, (page_info.basename or 'index') + '.css')
-	if os.path.exists(css_path):
-		if '{% block style %}' not in html:
-			with io.open(css_path, 'r', encoding='utf-8') as f:
-				css = f.read()
-				page_info.colocated_css = css
+	if os.path.exists(css_path) and '{% block style %}' not in html:
+		with io.open(css_path, 'r', encoding='utf-8') as f:
+			css = f.read()
+			page_info.colocated_css = css
 
 	if html:
 		page_info.source = html

From 1f2cf125035185bd3c610702afa7de0969d7bbb8 Mon Sep 17 00:00:00 2001
From: Himanshu <himanshuwarekar@yahoo.com>
Date: Wed, 22 Jul 2020 14:14:05 +0530
Subject: [PATCH 29/34] Update
 frappe/website/doctype/help_article/templates/help_article.html

Co-authored-by: Prssanna Desai <prssud@gmail.com>
---
 frappe/website/doctype/help_article/templates/help_article.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frappe/website/doctype/help_article/templates/help_article.html b/frappe/website/doctype/help_article/templates/help_article.html
index f5583931e2..1b4bf123e6 100644
--- a/frappe/website/doctype/help_article/templates/help_article.html
+++ b/frappe/website/doctype/help_article/templates/help_article.html
@@ -24,7 +24,7 @@
 		<div class="text-muted small mr-2 mb-2">{{ _("Was this article helpful?") }}</div>
 		<button class="feedback btn btn-outline-primary btn-sm" data-value="Yes" style="width: 50px;">{{ _("Yes") }}</button>
 		<button class="feedback btn btn-outline-primary btn-sm" data-value="No" style="width: 50px;">{{ _("No") }}</button>
-		<button class="feedback-msg btn btn-sm disabled hide">{{ _("Thank you for your feedback!") }}</button>
+		<span class="feedback-msg small hidden">{{ _("Thank you for your feedback!") }}</span>
 	</div>
 </div>
 <div class="help-article-comments">

From 19ff07b53b4927fca53faae2f9adb82ad3159305 Mon Sep 17 00:00:00 2001
From: Deepesh Garg <deepeshgarg6@gmail.com>
Date: Wed, 22 Jul 2020 14:27:18 +0530
Subject: [PATCH 30/34] fix: Margin top for child table index checkboxes

---
 frappe/public/less/desk.less | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/frappe/public/less/desk.less b/frappe/public/less/desk.less
index 36ceed9bfa..d951178be0 100644
--- a/frappe/public/less/desk.less
+++ b/frappe/public/less/desk.less
@@ -789,6 +789,10 @@ li.user-progress {
 	position: relative;
 }
 
+.row-index input[type=checkbox] {
+	margin-top: 12px;
+}
+
 @checkbox-height: 14px;
 
 // custom font awesome checkbox

From 64a03125460fec1ac6e6c7352a3f5e68c8f7ee08 Mon Sep 17 00:00:00 2001
From: Shivam Mishra <scm.mymail@gmail.com>
Date: Wed, 22 Jul 2020 15:51:07 +0530
Subject: [PATCH 31/34] feat: always render footer links layout

---
 frappe/templates/includes/footer/footer_links.html | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/frappe/templates/includes/footer/footer_links.html b/frappe/templates/includes/footer/footer_links.html
index fe9f69fed3..e8bfdadb7f 100644
--- a/frappe/templates/includes/footer/footer_links.html
+++ b/frappe/templates/includes/footer/footer_links.html
@@ -7,8 +7,6 @@
 	{%- endif -%}
 </a>
 {% endmacro %}
-
-{% if footer_items -%}
 <div class="footer-links">
 	<div class="row">
 		<div class="footer-col-left col-sm-6">
@@ -24,4 +22,3 @@
 		</div>
 	</div>
 </div>
-{% endif %}

From b541ffac68d0ff140c937d40a2a2648ff754b0c2 Mon Sep 17 00:00:00 2001
From: Shivam Mishra <scmmishra@users.noreply.github.com>
Date: Wed, 22 Jul 2020 19:30:11 +0530
Subject: [PATCH 32/34] Revert "fix: set page actions after setting read only"

---
 frappe/public/js/frappe/form/form.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/frappe/public/js/frappe/form/form.js b/frappe/public/js/frappe/form/form.js
index 43128065bc..c0b76ee94d 100644
--- a/frappe/public/js/frappe/form/form.js
+++ b/frappe/public/js/frappe/form/form.js
@@ -1409,7 +1409,6 @@ frappe.ui.form.Form = class FrappeForm {
 			};
 		}
 		this.perm = perm;
-		this.toolbar.set_page_action();
 	}
 
 	trigger(event, doctype, docname) {

From 51a473336a56fa559ba2b3b7438495b3dcc6604c Mon Sep 17 00:00:00 2001
From: Deepesh Garg <deepeshgarg6@gmail.com>
Date: Wed, 22 Jul 2020 21:55:56 +0530
Subject: [PATCH 33/34] fix: Margin top for child table index checkboxes

---
 frappe/public/less/desk.less      | 4 ----
 frappe/public/less/form_grid.less | 4 ++++
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/frappe/public/less/desk.less b/frappe/public/less/desk.less
index d951178be0..36ceed9bfa 100644
--- a/frappe/public/less/desk.less
+++ b/frappe/public/less/desk.less
@@ -789,10 +789,6 @@ li.user-progress {
 	position: relative;
 }
 
-.row-index input[type=checkbox] {
-	margin-top: 12px;
-}
-
 @checkbox-height: 14px;
 
 // custom font awesome checkbox
diff --git a/frappe/public/less/form_grid.less b/frappe/public/less/form_grid.less
index 5cb04a252c..d9e7d8bceb 100644
--- a/frappe/public/less/form_grid.less
+++ b/frappe/public/less/form_grid.less
@@ -98,6 +98,10 @@
 	text-align: right;
 }
 
+.grid-row .grid-row-check {
+	margin-top: 12px;
+}
+
 .grid-row > .row {
 	.col:last-child {
 		margin-right: -10px;

From 047280013dcc6b8c55fdf5ad4bf44270fc81b3bc Mon Sep 17 00:00:00 2001
From: gavin <gavin18d@gmail.com>
Date: Thu, 23 Jul 2020 18:42:44 +0530
Subject: [PATCH 34/34] fix: Fetch latest files filtered by names (#11056)

---
 frappe/utils/backups.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/frappe/utils/backups.py b/frappe/utils/backups.py
index bb03c85bf9..9f9a64f296 100644
--- a/frappe/utils/backups.py
+++ b/frappe/utils/backups.py
@@ -104,11 +104,11 @@ class BackupGenerator:
 			this_file = cstr(this_file)
 			this_file_path = os.path.join(get_backup_path(), this_file)
 			if not is_file_old(this_file_path, older_than):
-				if "_private_files" in this_file_path:
+				if "-private-files" in this_file_path:
 					backup_path_private_files = this_file_path
-				elif "_files" in this_file_path:
+				elif "-files" in this_file_path:
 					backup_path_files = this_file_path
-				elif "_database" in this_file_path:
+				elif "-database" in this_file_path:
 					backup_path_db = this_file_path
 				elif "site_config" in this_file_path:
 					site_config_backup_path = this_file_path