mirror of
https://gitlab.com/allianceauth/allianceauth.git
synced 2025-07-27 05:02:27 +02:00
Compare commits
No commits in common. "d10562e9fcd2354463dcf4be1782276588fbb962" and "d61a49f2d97ff4c2cf7a9f18e76c272bd1b838d7" have entirely different histories.
d10562e9fc
...
d61a49f2d9
@ -38,6 +38,7 @@ urlpatterns = [
|
|||||||
name='token_refresh'
|
name='token_refresh'
|
||||||
),
|
),
|
||||||
path('dashboard/', views.dashboard, name='dashboard'),
|
path('dashboard/', views.dashboard, name='dashboard'),
|
||||||
|
path('dashboard_bs3/', views.dashboard_bs3, name='dashboard_bs3'),
|
||||||
path('task-counts/', views.task_counts, name='task_counts'),
|
path('task-counts/', views.task_counts, name='task_counts'),
|
||||||
path('esi-check/', views.esi_check, name='esi_check'),
|
path('esi-check/', views.esi_check, name='esi_check'),
|
||||||
]
|
]
|
||||||
|
@ -392,3 +392,12 @@ def esi_check(request) -> JsonResponse:
|
|||||||
"data": check_for_override_esi_error_message(_r)
|
"data": check_for_override_esi_error_message(_r)
|
||||||
}
|
}
|
||||||
return JsonResponse(data)
|
return JsonResponse(data)
|
||||||
|
|
||||||
|
|
||||||
|
@login_required
|
||||||
|
def dashboard_bs3(request):
|
||||||
|
"""Render dashboard view with BS3 theme.
|
||||||
|
|
||||||
|
This is an internal view used for testing BS3 backward compatibility in AA4 only.
|
||||||
|
"""
|
||||||
|
return render(request, 'authentication/dashboard_bs3.html')
|
||||||
|
@ -44,9 +44,9 @@ def system_package_redis(app_configs, **kwargs) -> list[CheckMessage]:
|
|||||||
errors.append(Warning("Unable to confirm Redis Version"))
|
errors.append(Warning("Unable to confirm Redis Version"))
|
||||||
return errors
|
return errors
|
||||||
if redis_version.major == 7 and redis_version.minor == 4 and timezone.now() > timezone.datetime(year=2025, month=8, day=31, tzinfo=datetime.timezone.utc):
|
if redis_version.major == 7 and redis_version.minor == 4 and timezone.now() > timezone.datetime(year=2025, month=8, day=31, tzinfo=datetime.timezone.utc):
|
||||||
errors.append(Warning(f"Redis {redis_version.public} in Security Support only, Updating Suggested", hint="https://allianceauth.readthedocs.io/en/latest/installation/allianceauth.html#redis-and-other-tools", id="allianceauth.checks.A001"))
|
errors.append(Error(f"Redis {redis_version.public} in Security Support only, Updating Suggested", hint="https://allianceauth.readthedocs.io/en/latest/installation/allianceauth.html#redis-and-other-tools", id="allianceauth.checks.A001"))
|
||||||
elif redis_version.major == 7 and redis_version.minor == 2:
|
elif redis_version.major == 7 and redis_version.minor == 2:
|
||||||
errors.append(Warning(f"Redis {redis_version.public} in Security Support only, Updating Suggested", hint="https://allianceauth.readthedocs.io/en/latest/installation/allianceauth.html#redis-and-other-tools", id="allianceauth.checks.A021"))
|
errors.append(Error(f"Redis {redis_version.public} in Security Support only, Updating Suggested", hint="https://allianceauth.readthedocs.io/en/latest/installation/allianceauth.html#redis-and-other-tools", id="allianceauth.checks.A019"))
|
||||||
elif redis_version.major == 7 and redis_version.minor == 0:
|
elif redis_version.major == 7 and redis_version.minor == 0:
|
||||||
errors.append(Error(f"Redis {redis_version.public} EOL", hint="https://allianceauth.readthedocs.io/en/latest/installation/allianceauth.html#redis-and-other-tools", id="allianceauth.checks.A019"))
|
errors.append(Error(f"Redis {redis_version.public} EOL", hint="https://allianceauth.readthedocs.io/en/latest/installation/allianceauth.html#redis-and-other-tools", id="allianceauth.checks.A019"))
|
||||||
elif redis_version.major == 6 and redis_version.minor == 2:
|
elif redis_version.major == 6 and redis_version.minor == 2:
|
||||||
|
@ -68,3 +68,35 @@ class TestDefaultDashboardWithSideMenu(TestCase):
|
|||||||
self.assertEqual(links["/dashboard/"], "Dashboard")
|
self.assertEqual(links["/dashboard/"], "Dashboard")
|
||||||
self.assertEqual(links["/groups/"], "Groups")
|
self.assertEqual(links["/groups/"], "Groups")
|
||||||
self.assertNotIn("http://www.example.com/alpha", links)
|
self.assertNotIn("http://www.example.com/alpha", links)
|
||||||
|
|
||||||
|
|
||||||
|
class TestBS3DashboardWithSideMenu(TestCase):
|
||||||
|
def test_should_not_show_group_management_when_user_has_no_permission(self):
|
||||||
|
# given
|
||||||
|
user = create_user()
|
||||||
|
self.client.force_login(user)
|
||||||
|
|
||||||
|
# when
|
||||||
|
response = self.client.get("/dashboard_bs3/")
|
||||||
|
|
||||||
|
# then
|
||||||
|
self.assertEqual(response.status_code, HTTPStatus.OK)
|
||||||
|
links = extract_links(response)
|
||||||
|
self.assertEqual(links["/dashboard/"], "Dashboard")
|
||||||
|
self.assertEqual(links["/groups/"], "Groups")
|
||||||
|
self.assertNotIn("/groupmanagement/requests/", links)
|
||||||
|
|
||||||
|
def test_should_show_group_management_when_user_has_permission(self):
|
||||||
|
# given
|
||||||
|
user = create_user(permissions=["auth.group_management"])
|
||||||
|
self.client.force_login(user)
|
||||||
|
|
||||||
|
# when
|
||||||
|
response = self.client.get("/dashboard_bs3/")
|
||||||
|
|
||||||
|
# then
|
||||||
|
self.assertEqual(response.status_code, HTTPStatus.OK)
|
||||||
|
links = extract_links(response)
|
||||||
|
self.assertEqual(links["/dashboard/"], "Dashboard")
|
||||||
|
self.assertEqual(links["/groups/"], "Groups")
|
||||||
|
self.assertEqual(links["/groupmanagement/requests/"], "Group Management")
|
||||||
|
@ -108,8 +108,9 @@ class DiscourseManager:
|
|||||||
providers.discourse.client.activate(u_id)
|
providers.discourse.client.activate(u_id)
|
||||||
|
|
||||||
@staticmethod
|
@staticmethod
|
||||||
def __update_user(username, **kwargs) -> None:
|
def __update_user(username, **kwargs):
|
||||||
providers.discourse.client.update_user(username, **kwargs)
|
u_id = DiscourseManager.__user_name_to_id(username)
|
||||||
|
providers.discourse.client.update_user(endpoint, u_id, **kwargs)
|
||||||
|
|
||||||
@staticmethod
|
@staticmethod
|
||||||
def __create_user(username, email, password):
|
def __create_user(username, email, password):
|
||||||
|
Loading…
x
Reference in New Issue
Block a user