From 864d20274e94914db75ff58c0d882ad4e3686c0e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Norman=20J=C3=A4ckel?= <my-git-mail@normanjaeckel.de>
Date: Sat, 11 May 2013 00:59:07 +0200
Subject: [PATCH] Fixed #636. Insert general url_name_args attribute to some
 generic views in utils.views.

---
 openslides/motion/views.py |  3 ++-
 openslides/utils/views.py  | 48 ++++++++++++++++++++++++++++++++++++--
 2 files changed, 48 insertions(+), 3 deletions(-)

diff --git a/openslides/motion/views.py b/openslides/motion/views.py
index 811f90470..e5f771fb3 100644
--- a/openslides/motion/views.py
+++ b/openslides/motion/views.py
@@ -583,8 +583,9 @@ reset_state = MotionSetStateView.as_view(reset=True)
 class CreateAgendaItemView(SingleObjectMixin, RedirectView):
     """View to create and agenda item for a motion."""
     permission_required = 'agenda.can_manage_agenda'
-    url_name = 'item_overview'
     model = Motion
+    url_name = 'item_overview'
+    url_name_args = []
 
     def get(self, request, *args, **kwargs):
         """Set self.object to a motion."""
diff --git a/openslides/utils/views.py b/openslides/utils/views.py
index 35a5c39dc..72886e059 100644
--- a/openslides/utils/views.py
+++ b/openslides/utils/views.py
@@ -103,8 +103,17 @@ class ExtraContextMixin(object):
 
 
 class UrlMixin(object):
+    """
+    Mixin to provide the use of url names in views with success url and
+    apply url.
+
+    The initial value of url_name_args is None, but the default given by
+    the used get_url_name_args method is [], because in the future, the
+    method might return another default value. Compare this with the QuestionMixin.
+    """
     apply_url_name = None
     success_url_name = None
+    url_name_args = None
     success_url = None
     apply_url = None
 
@@ -133,19 +142,33 @@ class UrlMixin(object):
                 return self.object.get_absolute_url()
             except AttributeError:
                 raise ImproperlyConfigured(
-                    "No URL to redirect to.  Either provide a url or define"
-                    " a get_absolute_url method on the Model.")
+                    "No URL to redirect to. Either provide an URL or define "
+                    "a get_absolute_url method of the model.")
 
     def get_url_name_args(self):
+        """
+        Returns the arguments for the url name. Default is an empty list.
+        """
+        if self.url_name_args is not None:
+            return self.url_name_args
         return []
 
 
 class QuestionMixin(object):
+    """
+    Mixin for questions to the requesting user.
+
+    The initial value of url_name_args is None, but the default given by
+    the used get_url_name_args method is [self.object.pk] if it exist, else
+    an empty list. Set url_name_args to an empty list, if you use an url
+    name which does not need any arguments.
+    """
     question = ugettext_lazy('Are you sure?')
     success_message = ugettext_lazy('Thank you for your answer')
     answer_options = [('yes', ugettext_lazy("Yes")), ('no', ugettext_lazy("No"))]
     question_url_name = None
     success_url_name = None
+    url_name_args = None
 
     def get_redirect_url(self, **kwargs):
         if self.request.method == 'GET':
@@ -160,6 +183,12 @@ class QuestionMixin(object):
         return self.get_url_name_args()
 
     def get_url_name_args(self):
+        """
+        Returns the arguments for the url name. Default is an empty list
+        or [self.object.pk] if this exist.
+        """
+        if self.url_name_args is not None:
+            return self.url_name_args
         try:
             return [self.object.pk]
         except AttributeError:
@@ -235,9 +264,18 @@ class AjaxView(PermissionMixin, AjaxMixin, View):
 
 
 class RedirectView(PermissionMixin, AjaxMixin, _RedirectView):
+    """
+    View to redirect to another url.
+
+    The initial value of url_name_args is None, but the default given by
+    the used get_url_name_args method is [self.object.pk] if it exist, else
+    an empty list. Set url_name_args to an empty list, if you use an url
+    name which does not need any arguments.
+    """
     permanent = False
     allow_ajax = False
     url_name = None
+    url_name_args = None
 
     def pre_redirect(self, request, *args, **kwargs):
         pass
@@ -262,6 +300,12 @@ class RedirectView(PermissionMixin, AjaxMixin, _RedirectView):
             return super(RedirectView, self).get_redirect_url(**kwargs)
 
     def get_url_name_args(self):
+        """
+        Returns the arguments for the url name. Default is an empty list
+        or [self.object.pk] if this exist.
+        """
+        if self.url_name_args is not None:
+            return self.url_name_args
         try:
             return [self.object.pk]
         except AttributeError: