DAV-KA/django-dav-events
1
0
Fork 0
Code Issues 24 Pull Requests Actions Releases Wiki Activity

Refactor: split code into several django apps (we call them modules).

Browse Source
This commit is contained in:
heinzel
2018-12-13 14:47:58 +01:00
parent c23dc33d4e
commit 0d5a8c65e3
81 changed files with 739 additions and 332 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
dav_events/views/__init__.py
View File

@@ -1,4 +1,3 @@
from . import base
from . import auth
from . import events
from . import actions

72
dav_events/views/auth.py
View File

@@ -1,72 +0,0 @@
import logging
from django.contrib import messages
from django.contrib.auth import views as auth_views, get_user_model
from django.urls import reverse_lazy
from django.utils.translation import ugettext as _
from django.views import generic
from .. import emails
from .. import forms
logger = logging.getLogger(__name__)
class LoginView(auth_views.LoginView):
form_class = forms.auth.LoginForm
next_page = reverse_lazy('dav_events:event_list')
template_name = 'dav_events/auth/login_form.html'
def get_success_url(self):
url = self.get_redirect_url()
return url or self.next_page
def form_valid(self, form):
r = super(LoginView, self).form_valid(form)
messages.success(self.request, _(u'Benutzer angemeldet: %(username)s') % {'username': form.get_user()})
return r
class LogoutView(auth_views.LogoutView):
next_page = reverse_lazy('dav_events:home')
def dispatch(self, request, *args, **kwargs):
r = super(LogoutView, self).dispatch(request, *args, **kwargs)
messages.success(self.request, _(u'Benutzer abgemeldet.'))
return r
class SetPasswordView(auth_views.PasswordChangeView):
form_class = forms.auth.SetPasswordForm
template_name = 'dav_events/auth/set_password_form.html'
success_url = reverse_lazy('dav_events:event_list')
def form_valid(self, form):
r = super(SetPasswordView, self).form_valid(form)
messages.success(self.request, _(u'Passwort gespeichert.'))
if form.cleaned_data.get('send_password_mail', False):
email = emails.PasswordSetEmail(self.request.user, form.cleaned_data['new_password'])
email.send()
return r
class ResetPasswordView(generic.FormView):
form_class = forms.auth.ResetPasswordForm
template_name = 'dav_events/auth/reset_password_form.html'
success_url = reverse_lazy('dav_events:login')
def form_valid(self, form):
username = form.cleaned_data.get('username')
user_model = get_user_model()
try:
user = user_model.objects.get(username=username)
random_password = user_model.objects.make_random_password(length=12)
user.set_password(random_password)
user.save()
email = emails.PasswordSetEmail(user, random_password)
email.send()
messages.success(self.request, _(u'Neues Passwort versendet.'))
logger.info('Password reset for user \'%s\'', username)
except user_model.DoesNotExist:
logger.warning('Password reset for unknown user \'%s\'', username)
return super(ResetPasswordView, self).form_valid(form)

9
dav_events/views/events.py
View File

@@ -20,7 +20,6 @@ from .. import models
from ..utils import has_role
from ..workflow import workflow
app_config = apps.get_containing_app_config(__package__)
logger = logging.getLogger(__name__)
@@ -259,7 +258,7 @@ class EventCreateView(EventPermissionMixin, generic.FormView):
form_class = forms.events.EventCreateForm
template_dir = os.path.join('dav_events', 'event_create')
default_template_name = 'default.html'
abort_url = reverse_lazy('dav_events:home')
abort_url = reverse_lazy('dav_events:root')
def get_template_names(self):
form = self.get_form()
@@ -317,7 +316,7 @@ class EventCreateView(EventPermissionMixin, generic.FormView):
owner = event.owner
self.clean_session_data()
if self.request.user.is_authenticated:
next_url = reverse('dav_events:event_list')
next_url = reverse('dav_events:list')
if self.request.user != event.owner:
messages.warning(self.request,
u'%s %s' % (
@@ -325,10 +324,10 @@ class EventCreateView(EventPermissionMixin, generic.FormView):
_(u'Warum machst du sowas?')
))
elif owner.has_usable_password():
next_url = reverse('dav_events:event_list')
next_url = reverse('dav_events:list')
else:
login(self.request, owner)
next_url = reverse('dav_events:set_password')
next_url = reverse('dav_auth:set_password')
messages.success(self.request,
_(u'Neuen Benutzer angemeldet: %(username)s') % {'username': owner.username})
messages.warning(self.request, _(u'Bitte neues Passwort setzen!'))