From 13b2ea6c46513cb0b85e2a24b67903bab30a1333 Mon Sep 17 00:00:00 2001 From: toxinu Date: Mon, 27 Apr 2020 17:20:32 +0900 Subject: [PATCH 1/3] Add test to show exception --- openedx/core/tests/test_admin_view.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/openedx/core/tests/test_admin_view.py b/openedx/core/tests/test_admin_view.py index c1d45e6911..fd9f90bc59 100644 --- a/openedx/core/tests/test_admin_view.py +++ b/openedx/core/tests/test_admin_view.py @@ -41,3 +41,7 @@ class TestAdminView(TestCase): response = self.client.get(reverse('admin:login')) assert response.url == '/login?next=/admin' assert response.status_code == 302 + + with ENABLE_LOGIN_USING_THIRDPARTY_AUTH_ONLY.override(False): + response = self.client.get(reverse('admin:login')) + assert response.template_name == ['admin/login.html'] From a68b6036385c58bca02cc0d1e1ac5308623f0e74 Mon Sep 17 00:00:00 2001 From: toxinu Date: Mon, 27 Apr 2020 17:21:13 +0900 Subject: [PATCH 2/3] Can only check user specific permissions if logged in --- openedx/core/djangoapps/content_libraries/permissions.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openedx/core/djangoapps/content_libraries/permissions.py b/openedx/core/djangoapps/content_libraries/permissions.py index c2acfcf47f..555fde0fa0 100644 --- a/openedx/core/djangoapps/content_libraries/permissions.py +++ b/openedx/core/djangoapps/content_libraries/permissions.py @@ -56,7 +56,7 @@ perms[CAN_LEARN_FROM_THIS_CONTENT_LIBRARY] = ( # Regular users can learn if the library allows public learning: Attribute('allow_public_learning', True) | # Users/groups who are explicitly granted permission can learn from the library: - has_explicit_read_permission_for_library + (is_user_active & has_explicit_read_permission_for_library) ) # Is the user allowed to create content libraries? From c565f7b850ce92866851f2b93848a24b56e336e5 Mon Sep 17 00:00:00 2001 From: toxinu Date: Mon, 27 Apr 2020 20:05:57 +0900 Subject: [PATCH 3/3] Remove blank line --- openedx/core/tests/test_admin_view.py | 1 - 1 file changed, 1 deletion(-) diff --git a/openedx/core/tests/test_admin_view.py b/openedx/core/tests/test_admin_view.py index fd9f90bc59..7362a8c146 100644 --- a/openedx/core/tests/test_admin_view.py +++ b/openedx/core/tests/test_admin_view.py @@ -41,7 +41,6 @@ class TestAdminView(TestCase): response = self.client.get(reverse('admin:login')) assert response.url == '/login?next=/admin' assert response.status_code == 302 - with ENABLE_LOGIN_USING_THIRDPARTY_AUTH_ONLY.override(False): response = self.client.get(reverse('admin:login')) assert response.template_name == ['admin/login.html']