mirror of
https://github.com/retspen/webvirtcloud
synced 2025-07-31 12:41:08 +00:00
format python code with black
This commit is contained in:
catborise
parent
ea409ca863
commit
217e106c8b
55 changed files with 2510 additions and 1454 deletions
|
|
@ -2,4 +2,4 @@ from django.apps import AppConfig
|
|||
|
||||
|
||||
class AdminConfig(AppConfig):
|
||||
name = 'admin'
|
||||
name = "admin"
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@ class Permission(P):
|
|||
"""
|
||||
|
||||
def __str__(self):
|
||||
return f'{self.content_type.app_label}: {self.name}'
|
||||
return f"{self.content_type.app_label}: {self.name}"
|
||||
|
||||
class Meta:
|
||||
proxy = True
|
||||
|
|
|
|||
|
|
@ -8,62 +8,66 @@ from accounts.models import UserAttributes
|
|||
|
||||
class AdminTestCase(TestCase):
|
||||
def setUp(self):
|
||||
self.client.login(username='admin', password='admin')
|
||||
self.client.login(username="admin", password="admin")
|
||||
|
||||
def test_group_list(self):
|
||||
response = self.client.get(reverse('admin:group_list'))
|
||||
response = self.client.get(reverse("admin:group_list"))
|
||||
self.assertEqual(response.status_code, 200)
|
||||
|
||||
def test_groups(self):
|
||||
response = self.client.get(reverse('admin:group_create'))
|
||||
response = self.client.get(reverse("admin:group_create"))
|
||||
self.assertEqual(response.status_code, 200)
|
||||
|
||||
response = self.client.post(reverse('admin:group_create'), {'name': 'Test Group'})
|
||||
self.assertRedirects(response, reverse('admin:group_list'))
|
||||
response = self.client.post(
|
||||
reverse("admin:group_create"), {"name": "Test Group"}
|
||||
)
|
||||
self.assertRedirects(response, reverse("admin:group_list"))
|
||||
|
||||
group = Group.objects.get(name='Test Group')
|
||||
group = Group.objects.get(name="Test Group")
|
||||
self.assertEqual(group.id, 1)
|
||||
|
||||
response = self.client.get(reverse('admin:group_update', args=[1]))
|
||||
response = self.client.get(reverse("admin:group_update", args=[1]))
|
||||
self.assertEqual(response.status_code, 200)
|
||||
|
||||
response = self.client.post(reverse('admin:group_update', args=[1]), {'name': 'Updated Group Test'})
|
||||
self.assertRedirects(response, reverse('admin:group_list'))
|
||||
response = self.client.post(
|
||||
reverse("admin:group_update", args=[1]), {"name": "Updated Group Test"}
|
||||
)
|
||||
self.assertRedirects(response, reverse("admin:group_list"))
|
||||
|
||||
group = Group.objects.get(id=1)
|
||||
self.assertEqual(group.name, 'Updated Group Test')
|
||||
self.assertEqual(group.name, "Updated Group Test")
|
||||
|
||||
response = self.client.get(reverse('admin:group_delete', args=[1]))
|
||||
response = self.client.get(reverse("admin:group_delete", args=[1]))
|
||||
self.assertEqual(response.status_code, 200)
|
||||
|
||||
response = self.client.post(reverse('admin:group_delete', args=[1]))
|
||||
self.assertRedirects(response, reverse('admin:group_list'))
|
||||
response = self.client.post(reverse("admin:group_delete", args=[1]))
|
||||
self.assertRedirects(response, reverse("admin:group_list"))
|
||||
|
||||
with self.assertRaises(ObjectDoesNotExist):
|
||||
Group.objects.get(id=1)
|
||||
|
||||
def test_user_list(self):
|
||||
response = self.client.get(reverse('admin:user_list'))
|
||||
response = self.client.get(reverse("admin:user_list"))
|
||||
self.assertEqual(response.status_code, 200)
|
||||
|
||||
def test_users(self):
|
||||
response = self.client.get(reverse('admin:user_create'))
|
||||
response = self.client.get(reverse("admin:user_create"))
|
||||
self.assertEqual(response.status_code, 200)
|
||||
|
||||
response = self.client.post(
|
||||
reverse('admin:user_create'),
|
||||
reverse("admin:user_create"),
|
||||
{
|
||||
'username': 'test',
|
||||
'password': 'test',
|
||||
'max_instances': 1,
|
||||
'max_cpus': 1,
|
||||
'max_memory': 1024,
|
||||
'max_disk_size': 4,
|
||||
"username": "test",
|
||||
"password": "test",
|
||||
"max_instances": 1,
|
||||
"max_cpus": 1,
|
||||
"max_memory": 1024,
|
||||
"max_disk_size": 4,
|
||||
},
|
||||
)
|
||||
self.assertRedirects(response, reverse('admin:user_list'))
|
||||
self.assertRedirects(response, reverse("admin:user_list"))
|
||||
|
||||
user = User.objects.get(username='test')
|
||||
user = User.objects.get(username="test")
|
||||
self.assertEqual(user.id, 2)
|
||||
|
||||
ua: UserAttributes = UserAttributes.objects.get(id=2)
|
||||
|
|
@ -73,23 +77,23 @@ class AdminTestCase(TestCase):
|
|||
self.assertEqual(ua.max_memory, 1024)
|
||||
self.assertEqual(ua.max_disk_size, 4)
|
||||
|
||||
response = self.client.get(reverse('admin:user_update', args=[2]))
|
||||
response = self.client.get(reverse("admin:user_update", args=[2]))
|
||||
self.assertEqual(response.status_code, 200)
|
||||
|
||||
response = self.client.post(
|
||||
reverse('admin:user_update', args=[2]),
|
||||
reverse("admin:user_update", args=[2]),
|
||||
{
|
||||
'username': 'utest',
|
||||
'max_instances': 2,
|
||||
'max_cpus': 2,
|
||||
'max_memory': 2048,
|
||||
'max_disk_size': 8,
|
||||
"username": "utest",
|
||||
"max_instances": 2,
|
||||
"max_cpus": 2,
|
||||
"max_memory": 2048,
|
||||
"max_disk_size": 8,
|
||||
},
|
||||
)
|
||||
self.assertRedirects(response, reverse('admin:user_list'))
|
||||
self.assertRedirects(response, reverse("admin:user_list"))
|
||||
|
||||
user = User.objects.get(id=2)
|
||||
self.assertEqual(user.username, 'utest')
|
||||
self.assertEqual(user.username, "utest")
|
||||
|
||||
ua: UserAttributes = UserAttributes.objects.get(id=2)
|
||||
self.assertEqual(ua.user_id, 2)
|
||||
|
|
@ -98,23 +102,23 @@ class AdminTestCase(TestCase):
|
|||
self.assertEqual(ua.max_memory, 2048)
|
||||
self.assertEqual(ua.max_disk_size, 8)
|
||||
|
||||
response = self.client.get(reverse('admin:user_block', args=[2]))
|
||||
response = self.client.get(reverse("admin:user_block", args=[2]))
|
||||
user = User.objects.get(id=2)
|
||||
self.assertFalse(user.is_active)
|
||||
|
||||
response = self.client.get(reverse('admin:user_unblock', args=[2]))
|
||||
response = self.client.get(reverse("admin:user_unblock", args=[2]))
|
||||
user = User.objects.get(id=2)
|
||||
self.assertTrue(user.is_active)
|
||||
|
||||
response = self.client.get(reverse('admin:user_delete', args=[2]))
|
||||
response = self.client.get(reverse("admin:user_delete", args=[2]))
|
||||
self.assertEqual(response.status_code, 200)
|
||||
|
||||
response = self.client.post(reverse('admin:user_delete', args=[2]))
|
||||
self.assertRedirects(response, reverse('admin:user_list'))
|
||||
response = self.client.post(reverse("admin:user_delete", args=[2]))
|
||||
self.assertRedirects(response, reverse("admin:user_list"))
|
||||
|
||||
with self.assertRaises(ObjectDoesNotExist):
|
||||
User.objects.get(id=2)
|
||||
|
||||
def test_logs(self):
|
||||
response = self.client.get(reverse('admin:logs'))
|
||||
response = self.client.get(reverse("admin:logs"))
|
||||
self.assertEqual(response.status_code, 200)
|
||||
|
|
|
|||
|
|
@ -3,16 +3,16 @@ from django.urls import path
|
|||
from . import views
|
||||
|
||||
urlpatterns = [
|
||||
path('groups/', views.group_list, name='group_list'),
|
||||
path('groups/create/', views.group_create, name='group_create'),
|
||||
path('groups/<int:pk>/update/', views.group_update, name='group_update'),
|
||||
path('groups/<int:pk>/delete/', views.group_delete, name='group_delete'),
|
||||
path('users/', views.user_list, name='user_list'),
|
||||
path('users/create/', views.user_create, name='user_create'),
|
||||
path('users/<int:pk>/update_password/', views.user_update_password, name='user_update_password'),
|
||||
path('users/<int:pk>/update/', views.user_update, name='user_update'),
|
||||
path('users/<int:pk>/delete/', views.user_delete, name='user_delete'),
|
||||
path('users/<int:pk>/block/', views.user_block, name='user_block'),
|
||||
path('users/<int:pk>/unblock/', views.user_unblock, name='user_unblock'),
|
||||
path('logs/', views.logs, name='logs'),
|
||||
path("groups/", views.group_list, name="group_list"),
|
||||
path("groups/create/", views.group_create, name="group_create"),
|
||||
path("groups/<int:pk>/update/", views.group_update, name="group_update"),
|
||||
path("groups/<int:pk>/delete/", views.group_delete, name="group_delete"),
|
||||
path("users/", views.user_list, name="user_list"),
|
||||
path("users/create/", views.user_create, name="user_create"),
|
||||
path("users/<int:pk>/update_password/", views.user_update_password, name="user_update_password"),
|
||||
path("users/<int:pk>/update/", views.user_update, name="user_update"),
|
||||
path("users/<int:pk>/delete/", views.user_delete, name="user_delete"),
|
||||
path("users/<int:pk>/block/", views.user_block, name="user_block"),
|
||||
path("users/<int:pk>/unblock/", views.user_unblock, name="user_unblock"),
|
||||
path("logs/", views.logs, name="logs"),
|
||||
]
|
||||
|
|
|
|||
|
|
@ -107,7 +107,11 @@ def user_create(request):
|
|||
return render(
|
||||
request,
|
||||
"admin/user_form.html",
|
||||
{"user_form": user_form, "attributes_form": attributes_form, "title": _("Create User")},
|
||||
{
|
||||
"user_form": user_form,
|
||||
"attributes_form": attributes_form,
|
||||
"title": _("Create User"),
|
||||
},
|
||||
)
|
||||
|
||||
|
||||
|
|
@ -116,7 +120,9 @@ def user_update(request, pk):
|
|||
user = get_object_or_404(User, pk=pk)
|
||||
attributes = UserAttributes.objects.get(user=user)
|
||||
user_form = forms.UserForm(request.POST or None, instance=user)
|
||||
attributes_form = forms.UserAttributesForm(request.POST or None, instance=attributes)
|
||||
attributes_form = forms.UserAttributesForm(
|
||||
request.POST or None, instance=attributes
|
||||
)
|
||||
if user_form.is_valid() and attributes_form.is_valid():
|
||||
user_form.save()
|
||||
attributes_form.save()
|
||||
|
|
@ -126,7 +132,11 @@ def user_update(request, pk):
|
|||
return render(
|
||||
request,
|
||||
"admin/user_form.html",
|
||||
{"user_form": user_form, "attributes_form": attributes_form, "title": _("Update User")},
|
||||
{
|
||||
"user_form": user_form,
|
||||
"attributes_form": attributes_form,
|
||||
"title": _("Update User"),
|
||||
},
|
||||
)
|
||||
|
||||
|
||||
|
|
@ -138,7 +148,10 @@ def user_update_password(request, pk):
|
|||
if form.is_valid():
|
||||
user = form.save()
|
||||
update_session_auth_hash(request, user) # Important!
|
||||
messages.success(request, _("Password changed for %(user)s") % {"user": user.username})
|
||||
messages.success(
|
||||
request,
|
||||
_("Password changed for %(user)s") % {"user": user.username}
|
||||
)
|
||||
return redirect("admin:user_list")
|
||||
else:
|
||||
messages.error(request, _("Wrong Data Provided"))
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue