ag-admin/OpenSlides
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fixed apply and success url in utils.views

Browse Source
This commit is contained in:
Oskar Hahn 2013-01-26 16:19:53 +01:00
parent 567e6c975a
commit ecb6419f8c
2 changed files with 27 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
openslides/motion/views.py
View File

@ -107,7 +107,6 @@ class MotionUpdateView(MotionMixin, UpdateView):
""" """
# TODO: set permissions # TODO: set permissions
model = Motion model = Motion
apply_url = ''
motion_edit = MotionUpdateView.as_view() motion_edit = MotionUpdateView.as_view()

44
openslides/utils/views.py
View File

@ -24,6 +24,7 @@ from reportlab.lib.units import cm
from django.contrib import messages from django.contrib import messages
from django.contrib.auth.decorators import login_required from django.contrib.auth.decorators import login_required
from django.core.context_processors import csrf from django.core.context_processors import csrf
from django.core.exceptions import ImproperlyConfigured
from django.core.urlresolvers import reverse from django.core.urlresolvers import reverse
from django.conf import settings from django.conf import settings
from django.dispatch import receiver from django.dispatch import receiver
@ -107,13 +108,32 @@ class ExtraContextMixin(object):
return context return context
class SuccessUrlMixin(object): class UrlMixin(object):
apply_url_name = None
success_url_name = None
success_url = None
apply_url = None
def get_apply_url(self):
if self.apply_url_name:
return reverse(self.apply_url_name)
elif self.apply_url:
return self.apply_url
else:
try:
return self.object.get_absolute_url('edit')
except AttributeError:
raise ImproperlyConfigured(
"No URL to redirect to. Provide an apply_url_name.")
def get_success_url(self): def get_success_url(self):
messages.success(self.request, self.get_success_message()) messages.success(self.request, self.get_success_message())
if 'apply' in self.request.POST: if 'apply' in self.request.POST:
return reverse(self.get_apply_url(), args=[self.object.id]) return self.get_apply_url()
if self.success_url: if self.success_url_name:
url = reverse(self.success_url) return reverse(self.success_url)
elif self.success_url:
return self.success_url
else: else:
try: try:
url = self.object.get_absolute_url() url = self.object.get_absolute_url()
@ -219,7 +239,7 @@ class RedirectView(PermissionMixin, AjaxMixin, _RedirectView):
return reverse(super(RedirectView, self).get_redirect_url(**kwargs)) return reverse(super(RedirectView, self).get_redirect_url(**kwargs))
class FormView(PermissionMixin, ExtraContextMixin, SuccessUrlMixin, _FormView): class FormView(PermissionMixin, ExtraContextMixin, UrlMixin, _FormView):
def form_invalid(self, form): def form_invalid(self, form):
messages.error(self.request, _('Please check the form for errors.')) messages.error(self.request, _('Please check the form for errors.'))
return super(FormView, self).form_invalid(form) return super(FormView, self).form_invalid(form)
@ -240,7 +260,7 @@ class ModelFormMixin(object):
form.save_m2m() form.save_m2m()
class UpdateView(PermissionMixin, SuccessUrlMixin, ExtraContextMixin, class UpdateView(PermissionMixin, UrlMixin, ExtraContextMixin,
ModelFormMixin, _UpdateView): ModelFormMixin, _UpdateView):
def form_invalid(self, form): def form_invalid(self, form):
messages.error(self.request, _('Please check the form for errors.')) messages.error(self.request, _('Please check the form for errors.'))
@ -250,18 +270,8 @@ class UpdateView(PermissionMixin, SuccessUrlMixin, ExtraContextMixin,
return _('%s was successfully modified.') % html_strong(self.object) return _('%s was successfully modified.') % html_strong(self.object)
class CreateView(PermissionMixin, SuccessUrlMixin, ExtraContextMixin, class CreateView(PermissionMixin, UrlMixin, ExtraContextMixin,
ModelFormMixin, _CreateView): ModelFormMixin, _CreateView):
apply_url = None
success_url = None
def get_apply_url(self):
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): def form_invalid(self, form):
messages.error(self.request, _('Please check the form for errors.')) messages.error(self.request, _('Please check the form for errors.'))
return super(CreateView, self).form_invalid(form) return super(CreateView, self).form_invalid(form)