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

Added django messages.

Browse Source
This commit is contained in:
heinzel
2018-01-23 20:08:02 +01:00
parent 7de503f91e
commit 75b06041c6
5 changed files with 44 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
dav_events/static/dav_events/css/local.css
View File

@@ -48,8 +48,11 @@ thead input {
float: right; float: right;
} }
#messages {
margin-top: 2rem;
}
#page-body { #page-body {
padding-top: 2rem;
padding-bottom: 6rem; padding-bottom: 6rem;
} }

9
dav_events/templates/dav_events/base.html
View File

@@ -1,6 +1,7 @@
<!DOCTYPE html> <!DOCTYPE html>
{% load static %} {% load static %}
{% load i18n %} {% load i18n %}
{% load bootstrap3 %}
<html lang="{{ LANGUAGE_CODE|default:'de-de' }}"> <html lang="{{ LANGUAGE_CODE|default:'de-de' }}">
<head> <head>
<meta charset="utf-8"> <meta charset="utf-8">
@@ -34,6 +35,14 @@
<div id="login-widget">{% include 'dav_events/includes/login_widget.html' %}</div> <div id="login-widget">{% include 'dav_events/includes/login_widget.html' %}</div>
</div> </div>
<div id="messages">
{% block messages %}
<div class="container-fluid">
{% bootstrap_messages %}
</div>
{% endblock messages %}
</div>
<div id="page-body"> <div id="page-body">
{% block page-body %} {% block page-body %}
<div class="container-fluid"> <div class="container-fluid">

7
dav_events/templates/dav_events/home.html
View File

@@ -1,6 +1,13 @@
{% extends "dav_events/base.html" %} {% extends "dav_events/base.html" %}
{% load bootstrap3 %}
{% load i18n %} {% load i18n %}
{% block messages %}
<div class="container">
{% bootstrap_messages %}
</div>
{% endblock messages %}
{% block page-container %} {% block page-container %}
<h2>{% trans 'Veranstaltungen' %}</h2> <h2>{% trans 'Veranstaltungen' %}</h2>
<div class="well"> <div class="well">

18
dav_events/views/auth.py
View File

@@ -1,7 +1,8 @@
import logging import logging
from django.contrib import messages
from django.contrib.auth import views as auth_views from django.contrib.auth import views as auth_views
from django.urls import reverse_lazy from django.urls import reverse_lazy
from django.utils.translation import ugettext as _
from .. import forms from .. import forms
@@ -17,12 +18,27 @@ class LoginView(auth_views.LoginView):
url = self.get_redirect_url() url = self.get_redirect_url()
return url or self.next_page 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): class LogoutView(auth_views.LogoutView):
next_page = reverse_lazy('dav_events:home') 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): class SetPasswordView(auth_views.PasswordChangeView):
form_class = forms.auth.SetPasswordForm form_class = forms.auth.SetPasswordForm
template_name = 'dav_events/auth/set_password_form.html' template_name = 'dav_events/auth/set_password_form.html'
success_url = reverse_lazy('dav_events:event_list') 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.'))
return r

8
dav_events/views/events.py
View File

@@ -1,6 +1,6 @@
import logging import logging
import os import os
from django.contrib import messages
from django.contrib.auth import login from django.contrib.auth import login
from django.contrib.auth.decorators import login_required from django.contrib.auth.decorators import login_required
from django.core.exceptions import PermissionDenied, SuspiciousOperation from django.core.exceptions import PermissionDenied, SuspiciousOperation
@@ -8,6 +8,7 @@ from django.db.models import Q
from django.http import HttpResponseRedirect from django.http import HttpResponseRedirect
from django.urls import reverse, reverse_lazy from django.urls import reverse, reverse_lazy
from django.utils.decorators import method_decorator from django.utils.decorators import method_decorator
from django.utils.translation import ugettext as _
from django.views import generic from django.views import generic
from .. import config from .. import config
@@ -102,6 +103,7 @@ class EventAcceptView(EventDetailView):
def accept(self): def accept(self):
event = self.get_object() event = self.get_object()
event.accept() event.accept()
messages.success(self.request, _(u'Veranstaltung freigegeben.'))
def get(self, request, *args, **kwargs): def get(self, request, *args, **kwargs):
self.accept() self.accept()
@@ -160,6 +162,7 @@ class EventCreateView(generic.FormView):
return self.render_to_response(self.get_context_data(form=next_form, event=event)) return self.render_to_response(self.get_context_data(form=next_form, event=event))
else: else:
event.save() event.save()
messages.success(self.request, _(u'Veranstaltung angelegt.'))
owner = event.owner owner = event.owner
self.clean_session_data() self.clean_session_data()
if self.request.user.is_authenticated: if self.request.user.is_authenticated:
@@ -169,6 +172,9 @@ class EventCreateView(generic.FormView):
else: else:
login(self.request, owner) login(self.request, owner)
next_url = reverse('dav_events:set_password') next_url = reverse('dav_events:set_password')
messages.success(self.request,
_(u'Neuen Benutzer angemeldet: %(username)s') % {'username': owner.username})
messages.warning(self.request, _(u'Bitte neues Passwort setzen!'))
return HttpResponseRedirect(next_url) return HttpResponseRedirect(next_url)
def clean_session_data(self, session=None): def clean_session_data(self, session=None):