From 6c3eb0f7651e3441edcf831442e3186b77c677e8 Mon Sep 17 00:00:00 2001
From: Oskar Hahn <mail@oshahn.de>
Date: Fri, 1 Feb 2013 17:35:27 +0100
Subject: [PATCH] fixed urls in views from the participant app

---
 openslides/agenda/views.py      |  2 +-
 openslides/participant/views.py | 14 +++-----------
 openslides/utils/views.py       |  2 +-
 3 files changed, 5 insertions(+), 13 deletions(-)

diff --git a/openslides/agenda/views.py b/openslides/agenda/views.py
index 55b42e204..96f2b18e3 100644
--- a/openslides/agenda/views.py
+++ b/openslides/agenda/views.py
@@ -162,7 +162,7 @@ class ItemDelete(DeleteView):
     """
     permission_required = 'agenda.can_manage_agenda'
     model = Item
-    url = 'item_overview'
+    success_url_name = 'item_overview'
 
     def get_answer_options(self):
         if self.object.children.exists():
diff --git a/openslides/participant/views.py b/openslides/participant/views.py
index e39b5d9e6..fc282e1d1 100644
--- a/openslides/participant/views.py
+++ b/openslides/participant/views.py
@@ -163,8 +163,6 @@ class UserCreateView(CreateView):
     model = User
     context_object_name = 'edit_user'
     form_class = UserCreateForm
-    success_url = 'user_overview'
-    apply_url = 'user_edit'
 
     def manipulate_object(self, form):
         self.object.username = gen_username(
@@ -183,8 +181,6 @@ class UserUpdateView(UpdateView):
     model = User
     context_object_name = 'edit_user'
     form_class = UserUpdateForm
-    success_url = 'user_overview'
-    apply_url = 'participant_edit'
 
 
 class UserDeleteView(DeleteView):
@@ -193,7 +189,7 @@ class UserDeleteView(DeleteView):
     """
     permission_required = 'participant.can_manage_participant'
     model = User
-    url = 'user_overview'
+    success_url_name = 'user_overview'
 
     def pre_redirect(self, request, *args, **kwargs):
         if self.get_object() == self.request.user:
@@ -208,7 +204,7 @@ class SetUserStatusView(RedirectView, SingleObjectMixin):
     """
     permission_required = 'participant.can_manage_participant'
     allow_ajax = True
-    url = 'user_overview'
+    url_name = 'user_overview'
     model = User
 
     def pre_redirect(self, request, *args, **kwargs):
@@ -400,8 +396,6 @@ class GroupCreateView(CreateView):
     context_object_name = 'group'
     model = Group
     form_class = GroupForm
-    success_url = 'user_group_overview'
-    apply_url = 'user_group_edit'
 
     def get(self, request, *args, **kwargs):
         delete_default_permissions()
@@ -417,8 +411,6 @@ class GroupUpdateView(UpdateView):
     model = Group
     context_object_name = 'group'
     form_class = GroupForm
-    success_url = 'user_group_overview'
-    apply_url = 'user_group_edit'
 
     def get(self, request, *args, **kwargs):
         delete_default_permissions()
@@ -431,7 +423,7 @@ class GroupDeleteView(DeleteView):
     """
     permission_required = 'participant.can_manage_participant'
     model = Group
-    url = 'user_group_overview'
+    success_url_name = 'user_group_overview'
 
     def pre_redirect(self, request, *args, **kwargs):
         if self.get_object().name.lower() in ['anonymous', 'registered']:
diff --git a/openslides/utils/views.py b/openslides/utils/views.py
index 1b0c49496..3f048f532 100644
--- a/openslides/utils/views.py
+++ b/openslides/utils/views.py
@@ -307,7 +307,7 @@ class DeleteView(SingleObjectMixin, QuestionMixin, RedirectView):
             return reverse(self.success_url_name, args=self.get_url_name_args())
 
     def get_url_name_args(self):
-        return [self.poll.motion.pk]
+        return []
 
     def get_question(self):
         return _('Do you really want to delete %s?') % html_strong(self.object)