From 73b4aad3178fad752ffbe46b094e84af933e524d Mon Sep 17 00:00:00 2001
From: Rushabh Mehta <rmehta@gmail.com>
Date: Wed, 27 Jan 2021 10:45:58 +0530
Subject: [PATCH] fix(minor): weird grid scrolling behaviour

---
 frappe/public/js/frappe/form/form.js            | 2 +-
 frappe/public/js/frappe/form/grid_pagination.js | 6 ++++--
 frappe/website/doctype/web_page/web_page.py     | 3 +--
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/frappe/public/js/frappe/form/form.js b/frappe/public/js/frappe/form/form.js
index 2dcb8a28e2..e9f82a52c9 100644
--- a/frappe/public/js/frappe/form/form.js
+++ b/frappe/public/js/frappe/form/form.js
@@ -364,7 +364,7 @@ frappe.ui.form.Form = class FrappeForm {
 		this.grids.forEach(grid_obj => {
 			grid_obj.grid.visible_columns = null
 			// reset page number to 1
-			grid_obj.grid.grid_pagination.go_to_page(1);
+			grid_obj.grid.grid_pagination.go_to_page(1, true);
 		});
 		frappe.ui.form.close_grid_form();
 		this.docname = docname;
diff --git a/frappe/public/js/frappe/form/grid_pagination.js b/frappe/public/js/frappe/form/grid_pagination.js
index 2fd0798414..35daafe89d 100644
--- a/frappe/public/js/frappe/form/grid_pagination.js
+++ b/frappe/public/js/frappe/form/grid_pagination.js
@@ -95,7 +95,7 @@ export default class GridPagination {
 		}
 	}
 
-	go_to_page(index) {
+	go_to_page(index, from_refresh) {
 		if (!index) {
 			index = this.page_index;
 		} else {
@@ -108,7 +108,9 @@ export default class GridPagination {
 		}
 
 		this.update_page_numbers();
-		this.grid.scroll_to_top();
+		if (!from_refresh) {
+			this.grid.scroll_to_top();
+		}
 	}
 
 	go_to_last_page_to_add_row() {
diff --git a/frappe/website/doctype/web_page/web_page.py b/frappe/website/doctype/web_page/web_page.py
index 6984f22895..e09b978876 100644
--- a/frappe/website/doctype/web_page/web_page.py
+++ b/frappe/website/doctype/web_page/web_page.py
@@ -40,6 +40,7 @@ class WebPage(WebsiteGenerator):
 	def get_context(self, context):
 		context.main_section = get_html_content_based_on_type(self, 'main_section', self.content_type)
 		context.source_content_type = self.content_type
+		context.title = self.title
 
 		if self.context_script:
 			_locals = dict(context = frappe._dict())
@@ -55,12 +56,10 @@ class WebPage(WebsiteGenerator):
 		if self.enable_comments:
 			context.comment_list = get_comment_list(self.doctype, self.name)
 
-
 		context.update({
 			"style": self.css or "",
 			"script": self.javascript or "",
 			"header": self.header,
-			"title": self.title,
 			"text_align": self.text_align,
 		})