diff --git a/frappe/public/js/frappe/form/controls/link.js b/frappe/public/js/frappe/form/controls/link.js
index ce1e2ae79d..713ffe5f92 100644
--- a/frappe/public/js/frappe/form/controls/link.js
+++ b/frappe/public/js/frappe/form/controls/link.js
@@ -182,7 +182,7 @@ frappe.ui.form.ControlLink = frappe.ui.form.ControlData.extend({
let filter_string = me.get_filter_description(args.filters);
if (filter_string) {
r.results.push({
- html: `${filter_string}`,
+ html: `${filter_string}`,
value: '',
action: () => {}
});
diff --git a/frappe/public/js/frappe/form/grid.js b/frappe/public/js/frappe/form/grid.js
index 04eba6d995..ad35a96013 100644
--- a/frappe/public/js/frappe/form/grid.js
+++ b/frappe/public/js/frappe/form/grid.js
@@ -201,7 +201,7 @@ export default class Grid {
this.wrapper.find('.grid-heading-row .grid-row-check:checked:first').prop('checked', 0);
if (selected_children.length == this.grid_pagination.page_length) {
- frappe.utils.scroll_to(this.wrapper);
+ this.scroll_to_top();
}
}
@@ -213,9 +213,12 @@ export default class Grid {
this.wrapper.find('.grid-heading-row .grid-row-check:checked:first').prop('checked', 0);
this.refresh();
- frappe.utils.scroll_to(this.wrapper);
+ this.scroll_to_top();
});
+ }
+ scroll_to_top() {
+ frappe.utils.scroll_to(this.wrapper);
}
select_row(name) {
diff --git a/frappe/public/js/frappe/form/grid_pagination.js b/frappe/public/js/frappe/form/grid_pagination.js
index 0920bf5981..2fd0798414 100644
--- a/frappe/public/js/frappe/form/grid_pagination.js
+++ b/frappe/public/js/frappe/form/grid_pagination.js
@@ -108,6 +108,7 @@ export default class GridPagination {
}
this.update_page_numbers();
+ this.grid.scroll_to_top();
}
go_to_last_page_to_add_row() {
diff --git a/frappe/public/js/frappe/utils/utils.js b/frappe/public/js/frappe/utils/utils.js
index 9b2b61fce4..074832da4f 100644
--- a/frappe/public/js/frappe/utils/utils.js
+++ b/frappe/public/js/frappe/utils/utils.js
@@ -281,7 +281,7 @@ Object.assign(frappe.utils, {
},
get_scroll_position: function(element, additional_offset) {
- let header_offset = $(".navbar").height() + $(".page-head").height();
+ let header_offset = $(".navbar").height() + $(".page-head:visible").height();
let scroll_top = $(element).offset().top - header_offset - cint(additional_offset);
return scroll_top;
},
diff --git a/frappe/public/scss/desk/grid.scss b/frappe/public/scss/desk/grid.scss
index ff5a8cc879..02d8af6d38 100644
--- a/frappe/public/scss/desk/grid.scss
+++ b/frappe/public/scss/desk/grid.scss
@@ -370,6 +370,7 @@
background-color: var(--fg-color);
.btn {
box-shadow: none;
+ margin-top: -3px;
}
}