From 5d754984a32242ad9ad2623da165d2624485959a Mon Sep 17 00:00:00 2001 From: Oskar Hahn Date: Fri, 4 Jan 2013 12:39:42 +0100 Subject: [PATCH 1/6] fixed pep8 errors --- openslides/assignment/views.py | 2 +- openslides/participant/views.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/openslides/assignment/views.py b/openslides/assignment/views.py index f5e244732..6f95b44e0 100644 --- a/openslides/assignment/views.py +++ b/openslides/assignment/views.py @@ -318,7 +318,7 @@ class AssignmentPollDelete(DeleteView): return reverse('assignment_view', args=[self.assignment.id]) def get_success_message(self): - return _('Ballot was successfully deleted.') % self.object + return _('Ballot was successfully deleted.') % self.object class AssignmentPDF(PDFView): diff --git a/openslides/participant/views.py b/openslides/participant/views.py index bae5f0a69..ded8a55c7 100644 --- a/openslides/participant/views.py +++ b/openslides/participant/views.py @@ -471,7 +471,7 @@ def login(request): extra_content = {} try: admin = User.objects.get(pk=1) - if admin.check_password(admin.default_password): + if admin.check_password(admin.default_password): extra_content['first_time_message'] = _( "Installation was successfully! Use %(user)s " "(password: %(password)s) for first login.
" From 2f28655a2572e3c184084ac28c3dbc481fd7cd5e Mon Sep 17 00:00:00 2001 From: Oskar Hahn Date: Sat, 5 Jan 2013 01:03:42 +0100 Subject: [PATCH 2/6] Show Tabs if there do not define some permissions --- openslides/utils/template.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openslides/utils/template.py b/openslides/utils/template.py index 5ed5eb778..b0ded80ad 100644 --- a/openslides/utils/template.py +++ b/openslides/utils/template.py @@ -15,7 +15,7 @@ from django.template.loader_tags import BlockNode, ExtendsNode class Tab(object): - def __init__(self, title='', url='', permission='', selected=False): + def __init__(self, title='', url='', permission=True, selected=False): self.selected = False self.title = title self.permission = permission From 3229d86d4d00159677f684a5db862d3e1e11ec46 Mon Sep 17 00:00:00 2001 From: Oskar Hahn Date: Sat, 5 Jan 2013 01:05:38 +0100 Subject: [PATCH 3/6] Import urls.py needed django functions from django.conf.urls --- openslides/agenda/urls.py | 2 +- openslides/assignment/urls.py | 2 +- openslides/config/urls.py | 2 +- openslides/motion/urls.py | 2 +- openslides/participant/urls.py | 2 +- openslides/projector/urls.py | 2 +- openslides/urls.py | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/openslides/agenda/urls.py b/openslides/agenda/urls.py index 6022bff4d..392adbedf 100644 --- a/openslides/agenda/urls.py +++ b/openslides/agenda/urls.py @@ -10,7 +10,7 @@ :license: GNU GPL, see LICENSE for more details. """ -from django.conf.urls.defaults import url, patterns +from django.conf.urls import url, patterns from openslides.agenda.views import (Overview, View, SetClosed, ItemUpdate, ItemCreate, ItemDelete, AgendaPDF) diff --git a/openslides/assignment/urls.py b/openslides/assignment/urls.py index 5540b8a06..42e55b638 100644 --- a/openslides/assignment/urls.py +++ b/openslides/assignment/urls.py @@ -10,7 +10,7 @@ :license: GNU GPL, see LICENSE for more details. """ -from django.conf.urls.defaults import url, patterns +from django.conf.urls import url, patterns from openslides.assignment.views import (ViewPoll, AssignmentPDF, AssignmentPollPDF, AssignmentPollDelete, CreateAgendaItem) diff --git a/openslides/config/urls.py b/openslides/config/urls.py index 14659f5a8..84c1e93e9 100644 --- a/openslides/config/urls.py +++ b/openslides/config/urls.py @@ -11,7 +11,7 @@ """ from django.conf import settings -from django.conf.urls.defaults import patterns, url +from django.conf.urls import patterns, url from django.utils.importlib import import_module from openslides.config.views import GeneralConfig, VersionConfig diff --git a/openslides/motion/urls.py b/openslides/motion/urls.py index 177a5b04f..aff36a491 100644 --- a/openslides/motion/urls.py +++ b/openslides/motion/urls.py @@ -10,7 +10,7 @@ :license: GNU GPL, see LICENSE for more details. """ -from django.conf.urls.defaults import url, patterns +from django.conf.urls import url, patterns from openslides.motion.views import (MotionDelete, ViewPoll, MotionPDF, MotionPollPDF, CreateAgendaItem, SupportView) diff --git a/openslides/participant/urls.py b/openslides/participant/urls.py index 569f8b85f..8fa6b9ca9 100644 --- a/openslides/participant/urls.py +++ b/openslides/participant/urls.py @@ -10,7 +10,7 @@ :license: GNU GPL, see LICENSE for more details. """ -from django.conf.urls.defaults import url, patterns +from django.conf.urls import url, patterns from openslides.participant.views import ( UserOverview, UserCreateView, UserDetailView, UserUpdateView, diff --git a/openslides/projector/urls.py b/openslides/projector/urls.py index 9c1433ec4..e5a8d49c6 100644 --- a/openslides/projector/urls.py +++ b/openslides/projector/urls.py @@ -10,7 +10,7 @@ :license: GNU GPL, see LICENSE for more details. """ -from django.conf.urls.defaults import patterns, url +from django.conf.urls import patterns, url from openslides.projector.views import (DashboardView, ActivateView, CustomSlideCreateView, CustomSlideUpdateView, CustomSlideDeleteView, diff --git a/openslides/urls.py b/openslides/urls.py index 5edb948d0..800ef85e6 100644 --- a/openslides/urls.py +++ b/openslides/urls.py @@ -11,7 +11,7 @@ """ from django.conf import settings -from django.conf.urls.defaults import patterns, url, include +from django.conf.urls import patterns, url, include from django.utils.importlib import import_module from openslides.utils.views import RedirectView From ae8641bcad9e49f3c85fce46b56d82bee847493b Mon Sep 17 00:00:00 2001 From: Oskar Hahn Date: Sat, 5 Jan 2013 01:48:03 +0100 Subject: [PATCH 4/6] Raise an error if an CreateView does not define a apply_url --- openslides/utils/views.py | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/openslides/utils/views.py b/openslides/utils/views.py index fbc742bf4..33bdafc32 100644 --- a/openslides/utils/views.py +++ b/openslides/utils/views.py @@ -241,6 +241,8 @@ class UpdateView(PermissionMixin, _UpdateView): class CreateView(PermissionMixin, _CreateView): + apply_url = None + def get_success_url(self): messages.success(self.request, self.get_success_message()) if 'apply' in self.request.POST: @@ -254,7 +256,12 @@ class CreateView(PermissionMixin, _CreateView): return context def get_apply_url(self): - return self.apply_url + if self apply_url: + return self.apply_url + else: + raise ImproperlyConfigured( + "No URL to redirect to. Provide a apply_url.") + def form_invalid(self, form): messages.error(self.request, _('Please check the form for errors.')) From 2fcf0b3a07a14c5fbbcf416ad869ae2709cb2f5d Mon Sep 17 00:00:00 2001 From: Oskar Hahn Date: Sat, 5 Jan 2013 14:46:05 +0100 Subject: [PATCH 5/6] fixed typo in utils/views.py --- openslides/utils/views.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openslides/utils/views.py b/openslides/utils/views.py index 33bdafc32..0b3679f3a 100644 --- a/openslides/utils/views.py +++ b/openslides/utils/views.py @@ -256,7 +256,7 @@ class CreateView(PermissionMixin, _CreateView): return context def get_apply_url(self): - if self apply_url: + if self.apply_url: return self.apply_url else: raise ImproperlyConfigured( From 6417f5f10718a8f4d68963c72bca7f1f0e7905e1 Mon Sep 17 00:00:00 2001 From: Oskar Hahn Date: Sat, 5 Jan 2013 14:56:22 +0100 Subject: [PATCH 6/6] fixed pep8 error --- openslides/utils/views.py | 1 - 1 file changed, 1 deletion(-) diff --git a/openslides/utils/views.py b/openslides/utils/views.py index 0b3679f3a..603786370 100644 --- a/openslides/utils/views.py +++ b/openslides/utils/views.py @@ -262,7 +262,6 @@ class CreateView(PermissionMixin, _CreateView): raise ImproperlyConfigured( "No URL to redirect to. Provide a apply_url.") - def form_invalid(self, form): messages.error(self.request, _('Please check the form for errors.')) return super(CreateView, self).form_invalid(form)