+
`;
+
+ this.$loading.find('div').html(loading_state);
+ this.$report.hide();
+ this.$loading.show();
+ }
+
+ hide_loading_screen() {
+ this.$loading.hide();
+ this.$report.show();
+ }
+
get_chart_options(data) {
let options = this.report_settings.get_chart_data
? this.report_settings.get_chart_data(data.columns, data.result)
@@ -1675,6 +1695,8 @@ frappe.views.QueryReport = class QueryReport extends frappe.views.BaseList {
.hide().appendTo(this.page.main);
this.$chart = $('
+ 
+
+
+ ${__('Loading')}...
+').hide().appendTo(this.page.main);
+
+ this.$loading = $(this.message_div('')).hide().appendTo(this.page.main);
this.$report = $('
').appendTo(this.page.main);
this.$message = $(this.message_div('')).hide().appendTo(this.page.main);
}
@@ -1734,11 +1756,6 @@ frappe.views.QueryReport = class QueryReport extends frappe.views.BaseList {
this.refresh();
}
- toggle_loading(flag) {
- this.toggle_message(flag, __('Loading') + '...');
- }
-
-
toggle_nothing_to_show(flag) {
let message = this.prepared_report
? __('This is a background report. Please set the appropriate filters and then generate a new one.')
diff --git a/frappe/sessions.py b/frappe/sessions.py
index ce104968ad..bdf18f8d82 100644
--- a/frappe/sessions.py
+++ b/frappe/sessions.py
@@ -17,8 +17,8 @@ import redis
from urllib.parse import unquote
from frappe.cache_manager import clear_user_cache
-@frappe.whitelist(allow_guest=True)
-def clear(user=None):
+@frappe.whitelist()
+def clear():
frappe.local.session_obj.update(force=True)
frappe.local.db.commit()
clear_user_cache(frappe.session.user)
diff --git a/frappe/tests/test_permissions.py b/frappe/tests/test_permissions.py
index 48510f55f6..f4276b2d59 100644
--- a/frappe/tests/test_permissions.py
+++ b/frappe/tests/test_permissions.py
@@ -493,6 +493,34 @@ class TestPermissions(unittest.TestCase):
frappe.set_user("test2@example.com")
self.assertRaises(frappe.PermissionError, getdoc, 'Blog Post', doc.name)
+ def test_if_owner_permission_on_get_list(self):
+ doc = frappe.get_doc({
+ "doctype": "Blog Post",
+ "blog_category": "-test-blog-category",
+ "blogger": "_Test Blogger 1",
+ "title": "_Test If Owner Permissions on Get List",
+ "content": "_Test Blog Post Content"
+ })
+
+ doc.insert(ignore_if_duplicate=True)
+
+ update('Blog Post', 'Blogger', 0, 'if_owner', 1)
+ update('Blog Post', 'Blogger', 0, 'read', 1)
+ user = frappe.get_doc("User", "test2@example.com")
+ user.add_roles("Website Manager")
+ frappe.clear_cache(doctype="Blog Post")
+
+ frappe.set_user("test2@example.com")
+ self.assertIn(doc.name, frappe.get_list("Blog Post", pluck="name"))
+
+ # Become system manager to remove role
+ frappe.set_user("test1@example.com")
+ user.remove_roles("Website Manager")
+ frappe.clear_cache(doctype="Blog Post")
+
+ frappe.set_user("test2@example.com")
+ self.assertNotIn(doc.name, frappe.get_list("Blog Post", pluck="name"))
+
def test_if_owner_permission_on_delete(self):
update('Blog Post', 'Blogger', 0, 'if_owner', 1)
update('Blog Post', 'Blogger', 0, 'read', 1)
diff --git a/frappe/tests/test_website.py b/frappe/tests/test_website.py
index 818dc8bce6..688679a80f 100644
--- a/frappe/tests/test_website.py
+++ b/frappe/tests/test_website.py
@@ -4,6 +4,7 @@ import frappe
from frappe.utils import set_request
from frappe.website.serve import get_response, get_response_content
from frappe.website.utils import (build_response, clear_website_cache, get_home_page)
+from tenacity import retry, stop_after_attempt, retry_if_exception_type
class TestWebsite(unittest.TestCase):
@@ -196,6 +197,11 @@ class TestWebsite(unittest.TestCase):
delattr(frappe.hooks, 'page_renderer')
frappe.cache().delete_key('app_hooks')
+ # TODO: Get rid of this retry logic
+ # Added since test is flaky and we can't figure out why at this point
+ @retry(
+ stop=stop_after_attempt(5), retry=retry_if_exception_type(AssertionError),
+ )
def test_printview_page(self):
content = get_response_content('/Language/en')
self.assertIn('
', content)