mirror of
https://github.com/retspen/webvirtcloud
synced 2025-07-31 12:41:08 +00:00
lint with black python. convert f style strings to old one. some small fixes
This commit is contained in:
parent
c20c353a40
commit
508e3609be
54 changed files with 2123 additions and 1824 deletions
|
@ -1,6 +1,6 @@
|
|||
from django import forms
|
||||
from django.contrib.auth.models import Group, User
|
||||
from django.contrib.auth.forms import ReadOnlyPasswordHashField
|
||||
from django.contrib.auth.models import Group, User
|
||||
from django.urls import reverse_lazy
|
||||
from django.utils.text import format_lazy
|
||||
from django.utils.translation import gettext_lazy as _
|
||||
|
@ -13,7 +13,7 @@ from .models import Permission
|
|||
class GroupForm(forms.ModelForm):
|
||||
permissions = forms.ModelMultipleChoiceField(
|
||||
widget=forms.CheckboxSelectMultiple,
|
||||
queryset=Permission.objects.filter(content_type__model='permissionset'),
|
||||
queryset=Permission.objects.filter(content_type__model="permissionset"),
|
||||
required=False,
|
||||
)
|
||||
|
||||
|
@ -25,12 +25,12 @@ class GroupForm(forms.ModelForm):
|
|||
|
||||
def __init__(self, *args, **kwargs):
|
||||
super(GroupForm, self).__init__(*args, **kwargs)
|
||||
instance = getattr(self, 'instance', None)
|
||||
instance = getattr(self, "instance", None)
|
||||
if instance and instance.id:
|
||||
self.fields['users'].initial = self.instance.user_set.all()
|
||||
self.fields["users"].initial = self.instance.user_set.all()
|
||||
|
||||
def save_m2m(self):
|
||||
self.instance.user_set.set(self.cleaned_data['users'])
|
||||
self.instance.user_set.set(self.cleaned_data["users"])
|
||||
|
||||
def save(self, *args, **kwargs):
|
||||
instance = super(GroupForm, self).save()
|
||||
|
@ -39,36 +39,36 @@ class GroupForm(forms.ModelForm):
|
|||
|
||||
class Meta:
|
||||
model = Group
|
||||
fields = '__all__'
|
||||
fields = "__all__"
|
||||
|
||||
|
||||
class UserForm(forms.ModelForm):
|
||||
user_permissions = forms.ModelMultipleChoiceField(
|
||||
widget=forms.CheckboxSelectMultiple,
|
||||
queryset=Permission.objects.filter(content_type__model='permissionset'),
|
||||
label=_('Permissions'),
|
||||
queryset=Permission.objects.filter(content_type__model="permissionset"),
|
||||
label=_("Permissions"),
|
||||
required=False,
|
||||
)
|
||||
|
||||
groups = forms.ModelMultipleChoiceField(
|
||||
widget=forms.CheckboxSelectMultiple,
|
||||
queryset=Group.objects.all(),
|
||||
label=_('Groups'),
|
||||
label=_("Groups"),
|
||||
required=False,
|
||||
)
|
||||
|
||||
class Meta:
|
||||
model = User
|
||||
fields = [
|
||||
'username',
|
||||
'groups',
|
||||
'first_name',
|
||||
'last_name',
|
||||
'email',
|
||||
'user_permissions',
|
||||
'is_staff',
|
||||
'is_active',
|
||||
'is_superuser',
|
||||
"username",
|
||||
"groups",
|
||||
"first_name",
|
||||
"last_name",
|
||||
"email",
|
||||
"user_permissions",
|
||||
"is_staff",
|
||||
"is_active",
|
||||
"is_superuser",
|
||||
]
|
||||
|
||||
def __init__(self, *args, **kwargs):
|
||||
|
@ -76,12 +76,20 @@ class UserForm(forms.ModelForm):
|
|||
if self.instance.id:
|
||||
password = ReadOnlyPasswordHashField(
|
||||
label=_("Password"),
|
||||
help_text=format_lazy(_("""Raw passwords are not stored, so there is no way to see
|
||||
this user's password, but you can change the password using <a href='{}'>this form</a>."""),
|
||||
reverse_lazy('admin:user_update_password',
|
||||
args=[self.instance.id,]))
|
||||
help_text=format_lazy(
|
||||
_(
|
||||
"""Raw passwords are not stored, so there is no way to see this user's password,
|
||||
but you can change the password using <a href='{}'>this form</a>."""
|
||||
),
|
||||
reverse_lazy(
|
||||
"admin:user_update_password",
|
||||
args=[
|
||||
self.instance.id,
|
||||
],
|
||||
),
|
||||
),
|
||||
)
|
||||
self.fields['Password'] = password
|
||||
self.fields["Password"] = password
|
||||
|
||||
|
||||
class UserCreateForm(UserForm):
|
||||
|
@ -90,20 +98,20 @@ class UserCreateForm(UserForm):
|
|||
class Meta:
|
||||
model = User
|
||||
fields = [
|
||||
'username',
|
||||
'password',
|
||||
'groups',
|
||||
'first_name',
|
||||
'last_name',
|
||||
'email',
|
||||
'user_permissions',
|
||||
'is_staff',
|
||||
'is_active',
|
||||
'is_superuser',
|
||||
"username",
|
||||
"password",
|
||||
"groups",
|
||||
"first_name",
|
||||
"last_name",
|
||||
"email",
|
||||
"user_permissions",
|
||||
"is_staff",
|
||||
"is_active",
|
||||
"is_superuser",
|
||||
]
|
||||
|
||||
|
||||
class UserAttributesForm(forms.ModelForm):
|
||||
class Meta:
|
||||
model = UserAttributes
|
||||
exclude = ['user', 'can_clone_instances']
|
||||
exclude = ["user", "can_clone_instances"]
|
||||
|
|
|
@ -50,7 +50,7 @@ def group_update(request, pk):
|
|||
form = forms.GroupForm(request.POST or None, instance=group)
|
||||
if form.is_valid():
|
||||
form.save()
|
||||
return redirect('admin:group_list')
|
||||
return redirect("admin:group_list")
|
||||
|
||||
return render(
|
||||
request,
|
||||
|
@ -107,11 +107,7 @@ 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")},
|
||||
)
|
||||
|
||||
|
||||
|
@ -124,29 +120,25 @@ def user_update(request, pk):
|
|||
if user_form.is_valid() and attributes_form.is_valid():
|
||||
user_form.save()
|
||||
attributes_form.save()
|
||||
next = request.GET.get('next')
|
||||
next = request.GET.get("next")
|
||||
return redirect(next or "admin:user_list")
|
||||
|
||||
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")},
|
||||
)
|
||||
|
||||
|
||||
@superuser_only
|
||||
def user_update_password(request, pk):
|
||||
user = get_object_or_404(User, pk=pk)
|
||||
if request.method == 'POST':
|
||||
if request.method == "POST":
|
||||
form = AdminPasswordChangeForm(user, request.POST)
|
||||
if form.is_valid():
|
||||
user = form.save()
|
||||
update_session_auth_hash(request, user) # Important!
|
||||
messages.success(request, _("User password changed: {}".format(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