rescue/khaganat-web
1
0
Fork 0
Code Issues 6 Pull requests Projects Releases Packages Wiki Activity

Enforce coding style

Browse source
This commit is contained in:
Rodolphe Breard 2018-11-08 20:11:14 +01:00
parent e1719f4773
commit 428bd941e2
5 changed files with 43 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
logs/views.py
View file

@ -102,7 +102,8 @@ class EntriesView(generic.ListView):
if source is None: if source is None:
return [] return []
nb_max = settings.KHAGANAT_LOGS_MAX_DAYS - settings.KHAGANAT_LOGS_MIN_DAYS nb_max = settings.KHAGANAT_LOGS_MAX_DAYS
nb_max -= settings.KHAGANAT_LOGS_MIN_DAYS
lst = Entry.objects.filter( lst = Entry.objects.filter(
source=source, source=source,
) )

30
neluser/forms.py
View file

@ -12,10 +12,20 @@ class RegistrationForm(UserCreationForm):
model = NelUser model = NelUser
fields = (NelUser.EMAIL_FIELD,) fields = (NelUser.EMAIL_FIELD,)
class ChangePasswordForm(forms.Form): class ChangePasswordForm(forms.Form):
current_password = forms.CharField(label=_('current_password'), widget=forms.PasswordInput) current_password = forms.CharField(
new_password = forms.CharField(label=_('new_password'), widget=forms.PasswordInput) label=_('current_password'),
new_password_confirm = forms.CharField(label=_('new_password_confirm'), widget=forms.PasswordInput) widget=forms.PasswordInput
)
new_password = forms.CharField(
label=_('new_password'),
widget=forms.PasswordInput
)
new_password_confirm = forms.CharField(
label=_('new_password_confirm'),
widget=forms.PasswordInput
)
def __init__(self, *args, **kwargs): def __init__(self, *args, **kwargs):
self.request = kwargs.pop('request') self.request = kwargs.pop('request')
@ -28,17 +38,22 @@ class ChangePasswordForm(forms.Form):
new_pass_confirm = cleaned_data.get('new_password_confirm') new_pass_confirm = cleaned_data.get('new_password_confirm')
user = self.request.user user = self.request.user
if new_pass != new_pass_confirm: if new_pass != new_pass_confirm:
raise forms.ValidationError(_('The new password does not match its confirmation.')) msg = _('The new password does not match its confirmation.')
raise forms.ValidationError(msg)
try: try:
validate_password(new_pass, user=user) validate_password(new_pass, user=user)
except ValidationError as error: except ValidationError as error:
raise forms.ValidationError(error) raise forms.ValidationError(error)
if not user.check_password(old_pass): if not user.check_password(old_pass):
raise forms.ValidationError(_('The current password is incorrect.')) msg = _('The current password is incorrect.')
raise forms.ValidationError(msg)
class DeleteAccountForm(forms.Form): class DeleteAccountForm(forms.Form):
current_password = forms.CharField(label=_('current_password'), widget=forms.PasswordInput) current_password = forms.CharField(
label=_('current_password'),
widget=forms.PasswordInput
)
def __init__(self, *args, **kwargs): def __init__(self, *args, **kwargs):
self.request = kwargs.pop('request') self.request = kwargs.pop('request')
@ -49,4 +64,5 @@ class DeleteAccountForm(forms.Form):
password = cleaned_data.get('current_password') password = cleaned_data.get('current_password')
user = self.request.user user = self.request.user
if not user.check_password(password): if not user.check_password(password):
raise forms.ValidationError(_('The current password is incorrect.')) msg = _('The current password is incorrect.')
raise forms.ValidationError(msg)

12
neluser/urls.py
View file

@ -59,6 +59,14 @@ urlpatterns = [
path('settings/', views.settings_default, name='settings'), path('settings/', views.settings_default, name='settings'),
# Security # Security
path('settings/security/password/', views.ChangePasswordView.as_view(), name='password_change'), path(
path('settings/security/delete_account/', views.DeleteAccountView.as_view(), name='delete_account'), 'settings/security/password/',
views.ChangePasswordView.as_view(),
name='password_change'
),
path(
'settings/security/delete_account/',
views.DeleteAccountView.as_view(),
name='delete_account'
),
] ]

8
nsfw/views.py
View file

@ -73,7 +73,12 @@ def warn_msg(request, next_url=None):
'next_url': next_url, 'next_url': next_url,
'is_authenticated': request.user.is_authenticated, 'is_authenticated': request.user.is_authenticated,
} }
return render_to_string(request, 'nsfw/redirect_page.html', context=context) ret = render_to_string(
request,
'nsfw/redirect_page.html',
context=context
)
return ret
def redirect(request): def redirect(request):
@ -83,6 +88,7 @@ def redirect(request):
) )
return HttpResponseRedirect(dest) return HttpResponseRedirect(dest)
def alert(request, next_url=None): def alert(request, next_url=None):
context = { context = {
'next_url': next_url, 'next_url': next_url,

1
pages/templatetags/get_page.py
View file

@ -4,6 +4,7 @@ from django import template
register = template.Library() register = template.Library()
@register.simple_tag(takes_context=True) @register.simple_tag(takes_context=True)
def get_page(context, slug): def get_page(context, slug):
request = context['request'] request = context['request']