${__(
@@ -1253,6 +1264,8 @@ frappe.views.ListView = class ListView extends frappe.views.BaseList {
}
this.$checkbox_cursor = $target;
+
+ this.update_checkbox($target);
});
}
@@ -1398,6 +1411,7 @@ frappe.views.ListView = class ListView extends frappe.views.BaseList {
this.$checkbox_actions.show();
this.$list_head_subject.hide();
}
+ this.update_checkbox();
this.toggle_actions_menu_button(this.$checks.length > 0);
}
diff --git a/frappe/public/js/frappe/utils/utils.js b/frappe/public/js/frappe/utils/utils.js
index 831538d255..b49dfa0280 100644
--- a/frappe/public/js/frappe/utils/utils.js
+++ b/frappe/public/js/frappe/utils/utils.js
@@ -1049,18 +1049,20 @@ Object.assign(frappe.utils, {
return duration;
},
- seconds_to_duration(value, duration_options) {
- let secs = value;
- let total_duration = {
- days: Math.floor(secs / (3600 * 24)),
- hours: Math.floor(secs % (3600 * 24) / 3600),
- minutes: Math.floor(secs % 3600 / 60),
- seconds: Math.floor(secs % 60)
+ seconds_to_duration(seconds, duration_options) {
+ const round = seconds > 0 ? Math.floor : Math.ceil;
+ const total_duration = {
+ days: round(seconds / 86400), // 60 * 60 * 24
+ hours: round(seconds % 86400 / 3600),
+ minutes: round(seconds % 3600 / 60),
+ seconds: round(seconds % 60)
};
+
if (duration_options.hide_days) {
- total_duration.hours = Math.floor(secs / 3600);
+ total_duration.hours = round(seconds / 3600);
total_duration.days = 0;
}
+
return total_duration;
},
diff --git a/frappe/public/js/frappe/views/reports/query_report.js b/frappe/public/js/frappe/views/reports/query_report.js
index 7d68919821..4a3a953a01 100644
--- a/frappe/public/js/frappe/views/reports/query_report.js
+++ b/frappe/public/js/frappe/views/reports/query_report.js
@@ -107,7 +107,6 @@ frappe.views.QueryReport = class QueryReport extends frappe.views.BaseList {
}
if (this.report_name !== frappe.get_route()[1]) {
- // this.toggle_loading(true);
// different report
this.load_report();
}
@@ -556,6 +555,7 @@ frappe.views.QueryReport = class QueryReport extends frappe.views.BaseList {
refresh() {
this.toggle_message(true);
this.toggle_report(false);
+ this.show_loading_screen();
let filters = this.get_filter_values(true);
// only one refresh at a time
@@ -645,6 +645,8 @@ frappe.views.QueryReport = class QueryReport extends frappe.views.BaseList {
this.show_footer_message();
frappe.hide_progress();
+ }).finally(() => {
+ this.hide_loading_screen();
});
}
@@ -869,6 +871,24 @@ frappe.views.QueryReport = class QueryReport extends frappe.views.BaseList {
}
}
+ show_loading_screen() {
+ const loading_state = `
+
`;
+
+ 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)
@@ -1679,6 +1699,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);
}
@@ -1738,11 +1760,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/public/scss/desk/list.scss b/frappe/public/scss/desk/list.scss
index 4456acabb3..a49b5a463e 100644
--- a/frappe/public/scss/desk/list.scss
+++ b/frappe/public/scss/desk/list.scss
@@ -147,7 +147,6 @@
.list-row-head {
@extend .list-row;
- padding: 15px;
cursor: default;
.list-subject {
@@ -214,6 +213,10 @@ input.list-check-all, input.list-row-checkbox {
--checkbox-right-margin: calc(var(--checkbox-size) / 2 + #{$level-margin-right});
}
+input.list-check-all {
+ margin-left: 15px;
+}
+
.render-list-checkbox {
margin-left: 15px;
}
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)
diff --git a/requirements.txt b/requirements.txt
index 7a17d3794d..17f77efa5d 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -12,7 +12,6 @@ croniter~=1.0.11
cryptography~=3.4.7
dropbox~=11.7.0
email-reply-parser~=0.5.12
-Faker~=8.1.0
git-url-parse~=1.2.2
gitdb~=4.0.7
GitPython~=3.1.14
@@ -44,7 +43,6 @@ pyasn1~=0.4.8
pycryptodome~=3.10.1
PyJWT~=2.0.1
PyMySQL~=1.0.2
-pyngrok~=5.0.5
pyOpenSSL~=20.0.1
pyotp~=2.6.0
PyPDF2~=1.26.0
@@ -64,12 +62,10 @@ rq~=1.8.0
rsa>=4.1 # not directly required, pinned by Snyk to avoid a vulnerability
schedule~=1.1.0
semantic-version~=2.8.5
-simple-chalk~=0.1.0
six~=1.15.0
sqlparse~=0.4.1
stripe~=2.56.0
terminaltables~=3.1.0
-unittest-xml-reporting~=3.0.4
urllib3~=1.26.4
Werkzeug~=0.16.1
Whoosh~=2.7.4