diff --git a/frappe/model/db_query.py b/frappe/model/db_query.py index c5752abce8..c612c16742 100644 --- a/frappe/model/db_query.py +++ b/frappe/model/db_query.py @@ -16,6 +16,7 @@ class DatabaseQuery(object): self.tables = [] self.meta = [] self.conditions = [] + self.ignore_permissions = False self.fields = ["name"] def execute(self, query=None, filters=None, fields=None, docstatus=None, diff --git a/frappe/website/js/website.js b/frappe/website/js/website.js index 27beec87e3..e7745b84be 100644 --- a/frappe/website/js/website.js +++ b/frappe/website/js/website.js @@ -347,7 +347,7 @@ $.extend(frappe, { $("[data-html-block='breadcrumbs']").text().trim()==$("[data-html-block='header']").text().trim()); // to show full content width, when no sidebar content - var sidebar_has_content = !!$("[data-html-block='sidebar']").text().trim(); + var sidebar_has_content = !!$("[data-html-block='sidebar']").html().trim(); $(".page-sidebar, .toggle-sidebar").toggleClass("hidden", !sidebar_has_content); $(".page-sidebar").toggleClass("col-sm-push-9", sidebar_has_content); $(".page-content").toggleClass("col-sm-12", !sidebar_has_content); @@ -510,9 +510,9 @@ $(document).ready(function() { }); $(document).on("page-change", function() { - frappe.toggle_template_blocks(); $(document).trigger("apply_permissions"); frappe.datetime.refresh_when(); frappe.trigger_ready(); + frappe.toggle_template_blocks(); frappe.make_navbar_active(); });