kopia lustrzana https://github.com/wagtail/wagtail
Move account forms into admin
To be in the same app the views are definedpull/7288/head
Karl Hobley
Matt Westcott
rodzic
51c3c8cb40
commit
de8ee5ed99
|
|
@ -0,0 +1,124 @@
|
|||
import warnings
|
||||
|
||||
from operator import itemgetter
|
||||
|
||||
import l18n
|
||||
|
||||
from django import forms
|
||||
from django.contrib.auth import get_user_model
|
||||
from django.db.models.fields import BLANK_CHOICE_DASH
|
||||
from django.utils.translation import get_language_info
|
||||
from django.utils.translation import gettext_lazy as _
|
||||
|
||||
from wagtail.admin.localization import get_available_admin_languages, get_available_admin_time_zones
|
||||
from wagtail.admin.widgets import SwitchInput
|
||||
from wagtail.core.models import UserPagePermissionsProxy
|
||||
from wagtail.users.models import UserProfile
|
||||
|
||||
|
||||
User = get_user_model()
|
||||
|
||||
|
||||
class NotificationPreferencesForm(forms.ModelForm):
|
||||
def __init__(self, *args, **kwargs):
|
||||
super().__init__(*args, **kwargs)
|
||||
user_perms = UserPagePermissionsProxy(self.instance.user)
|
||||
if not user_perms.can_publish_pages():
|
||||
del self.fields['submitted_notifications']
|
||||
if not user_perms.can_edit_pages():
|
||||
del self.fields['approved_notifications']
|
||||
del self.fields['rejected_notifications']
|
||||
del self.fields['updated_comments_notifications']
|
||||
|
||||
class Meta:
|
||||
model = UserProfile
|
||||
fields = ['submitted_notifications', 'approved_notifications', 'rejected_notifications', 'updated_comments_notifications']
|
||||
widgets = {
|
||||
'submitted_notifications': SwitchInput(),
|
||||
'approved_notifications': SwitchInput(),
|
||||
'rejected_notifications': SwitchInput(),
|
||||
'updated_comments_notifications': SwitchInput(),
|
||||
}
|
||||
|
||||
|
||||
def _get_language_choices():
|
||||
language_choices = [
|
||||
(lang_code, get_language_info(lang_code)['name_local'])
|
||||
for lang_code, lang_name in get_available_admin_languages()
|
||||
]
|
||||
return sorted(BLANK_CHOICE_DASH + language_choices,
|
||||
key=lambda l: l[1].lower())
|
||||
|
||||
|
||||
def _get_time_zone_choices():
|
||||
time_zones = [(tz, str(l18n.tz_fullnames.get(tz, tz)))
|
||||
for tz in get_available_admin_time_zones()]
|
||||
time_zones.sort(key=itemgetter(1))
|
||||
return BLANK_CHOICE_DASH + time_zones
|
||||
|
||||
|
||||
class LocalePreferencesForm(forms.ModelForm):
|
||||
def __init__(self, *args, **kwargs):
|
||||
super().__init__(*args, **kwargs)
|
||||
|
||||
if len(get_available_admin_languages()) <= 1:
|
||||
del self.fields['preferred_language']
|
||||
|
||||
if len(get_available_admin_time_zones()) <= 1:
|
||||
del self.fields['current_time_zone']
|
||||
|
||||
preferred_language = forms.ChoiceField(
|
||||
required=False, choices=_get_language_choices,
|
||||
label=_("Preferred language")
|
||||
)
|
||||
|
||||
current_time_zone = forms.ChoiceField(
|
||||
required=False, choices=_get_time_zone_choices,
|
||||
label=_("Current time zone")
|
||||
)
|
||||
|
||||
class Meta:
|
||||
model = UserProfile
|
||||
fields = ['preferred_language', 'current_time_zone']
|
||||
|
||||
|
||||
class NameEmailForm(forms.ModelForm):
|
||||
first_name = forms.CharField(required=True, label=_('First Name'))
|
||||
last_name = forms.CharField(required=True, label=_('Last Name'))
|
||||
email = forms.EmailField(required=True, label=_('Email'))
|
||||
|
||||
def __init__(self, *args, **kwargs):
|
||||
from wagtail.admin.views.account import email_management_enabled
|
||||
super().__init__(*args, **kwargs)
|
||||
|
||||
if not email_management_enabled():
|
||||
del self.fields['email']
|
||||
|
||||
class Meta:
|
||||
model = User
|
||||
fields = ['first_name', 'last_name', 'email']
|
||||
|
||||
|
||||
class AvatarPreferencesForm(forms.ModelForm):
|
||||
avatar = forms.ImageField(
|
||||
label=_("Upload a profile picture"), required=False
|
||||
)
|
||||
|
||||
def __init__(self, *args, **kwargs):
|
||||
super().__init__(*args, **kwargs)
|
||||
self._original_avatar = self.instance.avatar
|
||||
|
||||
def save(self, commit=True):
|
||||
if commit and self._original_avatar and (self._original_avatar != self.cleaned_data['avatar']):
|
||||
# Call delete() on the storage backend directly, as calling self._original_avatar.delete()
|
||||
# will clear the now-updated field on self.instance too
|
||||
try:
|
||||
self._original_avatar.storage.delete(self._original_avatar.name)
|
||||
except IOError:
|
||||
# failure to delete the old avatar shouldn't prevent us from continuing
|
||||
warnings.warn("Failed to delete old avatar file: %s" % self._original_avatar.name)
|
||||
super().save(commit=commit)
|
||||
|
||||
class Meta:
|
||||
model = UserProfile
|
||||
fields = ["avatar"]
|
||||
|
|
@ -14,12 +14,12 @@ from django.utils.translation import gettext as _
|
|||
from django.utils.translation import gettext_lazy, override
|
||||
from django.views.decorators.debug import sensitive_post_parameters
|
||||
|
||||
from wagtail.admin.forms.account import (
|
||||
AvatarPreferencesForm, LocalePreferencesForm, NameEmailForm, NotificationPreferencesForm)
|
||||
from wagtail.admin.forms.auth import LoginForm, PasswordChangeForm, PasswordResetForm
|
||||
from wagtail.admin.localization import get_available_admin_languages, get_available_admin_time_zones
|
||||
from wagtail.core import hooks
|
||||
from wagtail.core.models import UserPagePermissionsProxy
|
||||
from wagtail.users.forms import (
|
||||
AvatarPreferencesForm, LocalePreferencesForm, NameEmailForm, NotificationPreferencesForm)
|
||||
from wagtail.users.models import UserProfile
|
||||
from wagtail.utils.loading import get_custom_form
|
||||
|
||||
|
|
|
|||
|
|
@ -1,9 +1,4 @@
|
|||
import warnings
|
||||
|
||||
from itertools import groupby
|
||||
from operator import itemgetter
|
||||
|
||||
import l18n
|
||||
|
||||
from django import forms
|
||||
from django.conf import settings
|
||||
|
|
@ -12,19 +7,14 @@ from django.contrib.auth.models import Group, Permission
|
|||
from django.contrib.auth.password_validation import (
|
||||
password_validators_help_text_html, validate_password)
|
||||
from django.db import transaction
|
||||
from django.db.models.fields import BLANK_CHOICE_DASH
|
||||
from django.template.loader import render_to_string
|
||||
from django.utils.html import mark_safe
|
||||
from django.utils.translation import get_language_info
|
||||
from django.utils.translation import gettext_lazy as _
|
||||
|
||||
from wagtail.admin.localization import get_available_admin_languages, get_available_admin_time_zones
|
||||
from wagtail.admin.widgets import AdminPageChooser, SwitchInput
|
||||
from wagtail.admin.widgets import AdminPageChooser
|
||||
from wagtail.core import hooks
|
||||
from wagtail.core.models import (
|
||||
PAGE_PERMISSION_TYPE_CHOICES, PAGE_PERMISSION_TYPES, GroupPagePermission, Page,
|
||||
UserPagePermissionsProxy)
|
||||
from wagtail.users.models import UserProfile
|
||||
PAGE_PERMISSION_TYPE_CHOICES, PAGE_PERMISSION_TYPES, GroupPagePermission, Page)
|
||||
|
||||
|
||||
User = get_user_model()
|
||||
|
|
@ -372,108 +362,3 @@ class BaseGroupPagePermissionFormSet(forms.BaseFormSet):
|
|||
GroupPagePermissionFormSet = forms.formset_factory(
|
||||
PagePermissionsForm, formset=BaseGroupPagePermissionFormSet, extra=0, can_delete=True
|
||||
)
|
||||
|
||||
|
||||
class NotificationPreferencesForm(forms.ModelForm):
|
||||
def __init__(self, *args, **kwargs):
|
||||
super().__init__(*args, **kwargs)
|
||||
user_perms = UserPagePermissionsProxy(self.instance.user)
|
||||
if not user_perms.can_publish_pages():
|
||||
del self.fields['submitted_notifications']
|
||||
if not user_perms.can_edit_pages():
|
||||
del self.fields['approved_notifications']
|
||||
del self.fields['rejected_notifications']
|
||||
del self.fields['updated_comments_notifications']
|
||||
|
||||
class Meta:
|
||||
model = UserProfile
|
||||
fields = ['submitted_notifications', 'approved_notifications', 'rejected_notifications', 'updated_comments_notifications']
|
||||
widgets = {
|
||||
'submitted_notifications': SwitchInput(),
|
||||
'approved_notifications': SwitchInput(),
|
||||
'rejected_notifications': SwitchInput(),
|
||||
'updated_comments_notifications': SwitchInput(),
|
||||
}
|
||||
|
||||
|
||||
def _get_language_choices():
|
||||
language_choices = [
|
||||
(lang_code, get_language_info(lang_code)['name_local'])
|
||||
for lang_code, lang_name in get_available_admin_languages()
|
||||
]
|
||||
return sorted(BLANK_CHOICE_DASH + language_choices,
|
||||
key=lambda l: l[1].lower())
|
||||
|
||||
|
||||
def _get_time_zone_choices():
|
||||
time_zones = [(tz, str(l18n.tz_fullnames.get(tz, tz)))
|
||||
for tz in get_available_admin_time_zones()]
|
||||
time_zones.sort(key=itemgetter(1))
|
||||
return BLANK_CHOICE_DASH + time_zones
|
||||
|
||||
|
||||
class LocalePreferencesForm(forms.ModelForm):
|
||||
def __init__(self, *args, **kwargs):
|
||||
super().__init__(*args, **kwargs)
|
||||
|
||||
if len(get_available_admin_languages()) <= 1:
|
||||
del self.fields['preferred_language']
|
||||
|
||||
if len(get_available_admin_time_zones()) <= 1:
|
||||
del self.fields['current_time_zone']
|
||||
|
||||
preferred_language = forms.ChoiceField(
|
||||
required=False, choices=_get_language_choices,
|
||||
label=_("Preferred language")
|
||||
)
|
||||
|
||||
current_time_zone = forms.ChoiceField(
|
||||
required=False, choices=_get_time_zone_choices,
|
||||
label=_("Current time zone")
|
||||
)
|
||||
|
||||
class Meta:
|
||||
model = UserProfile
|
||||
fields = ['preferred_language', 'current_time_zone']
|
||||
|
||||
|
||||
class NameEmailForm(forms.ModelForm):
|
||||
first_name = forms.CharField(required=True, label=_('First Name'))
|
||||
last_name = forms.CharField(required=True, label=_('Last Name'))
|
||||
email = forms.EmailField(required=True, label=_('Email'))
|
||||
|
||||
def __init__(self, *args, **kwargs):
|
||||
from wagtail.admin.views.account import email_management_enabled
|
||||
super().__init__(*args, **kwargs)
|
||||
|
||||
if not email_management_enabled():
|
||||
del self.fields['email']
|
||||
|
||||
class Meta:
|
||||
model = User
|
||||
fields = ['first_name', 'last_name', 'email']
|
||||
|
||||
|
||||
class AvatarPreferencesForm(forms.ModelForm):
|
||||
avatar = forms.ImageField(
|
||||
label=_("Upload a profile picture"), required=False
|
||||
)
|
||||
|
||||
def __init__(self, *args, **kwargs):
|
||||
super().__init__(*args, **kwargs)
|
||||
self._original_avatar = self.instance.avatar
|
||||
|
||||
def save(self, commit=True):
|
||||
if commit and self._original_avatar and (self._original_avatar != self.cleaned_data['avatar']):
|
||||
# Call delete() on the storage backend directly, as calling self._original_avatar.delete()
|
||||
# will clear the now-updated field on self.instance too
|
||||
try:
|
||||
self._original_avatar.storage.delete(self._original_avatar.name)
|
||||
except IOError:
|
||||
# failure to delete the old avatar shouldn't prevent us from continuing
|
||||
warnings.warn("Failed to delete old avatar file: %s" % self._original_avatar.name)
|
||||
super().save(commit=commit)
|
||||
|
||||
class Meta:
|
||||
model = UserProfile
|
||||
fields = ["avatar"]
|
||||
|
|
|
|||
Ładowanie…
Reference in New Issue