Add project argument to set_patches

MultiplePatchForm needs a project, so pass one down.

Signed-off-by: Jeremy Kerr <jk@ozlabs.org>

diff --git a/apps/patchwork/utils.py b/apps/patchwork/utils.py
index 7cf88bcb924ca19637263fb6f88f16ee165f3bd7..72eff4f764d81f88d9c2f4be239245b2cdc60c7b 100644 (file)
--- a/apps/patchwork/utils.py
+++ b/apps/patchwork/utils.py
@@ -130,9 +130,9 @@ def set_bundle(user, action, data, patches, context):
     return []
 
 
-def set_patches(user, action, data, patches, context):
+def set_patches(user, project, action, data, patches, context):
     errors = []
-    form = MultiplePatchForm(data = data)
+    form = MultiplePatchForm(project = project, data = data)
 
     try:
         project = Project.objects.get(id = data['project'])

diff --git a/apps/patchwork/views/__init__.py b/apps/patchwork/views/__init__.py
index 2636d29b7ee358152e9412effc51ff096c856584..b5c19c2e26705ef8c031182194f9ab1f9cc7d39a 100644 (file)
--- a/apps/patchwork/views/__init__.py
+++ b/apps/patchwork/views/__init__.py
@@ -54,8 +54,8 @@ def generic_list(request, project, view,
                 pass
             ps.append(patch)
 
-        (errors, form) = set_patches(request.user, action, request.POST, \
-                ps, context)
+        (errors, form) = set_patches(request.user, project, action, \
+                               request.POST, ps, context)
         if errors:
             context['errors'] = errors
 

diff --git a/apps/patchwork/views/patch.py b/apps/patchwork/views/patch.py
index d509e2887d68c70fb135df6b1dc78b345c23020b..f20f25d792e5b33321c43cf3e0a539419338ed51 100644 (file)
--- a/apps/patchwork/views/patch.py
+++ b/apps/patchwork/views/patch.py
@@ -156,7 +156,8 @@ def list(request, project_id):
                 pass
             ps.append(patch)
 
-        (errors, form) = set_patches(request.user, action, request.POST, ps)
+        (errors, form) = set_patches(request.user, project, action, \
+                               request.POST, ps)
         if errors:
             context['errors'] = errors
 

diff --git a/apps/patchwork/views/user.py b/apps/patchwork/views/user.py
index 59d01a57311d6d6e8011fd5726dbc7450d73e1ee..0e145494ab023a6c3888b7e3efdb21f828f17650 100644 (file)
--- a/apps/patchwork/views/user.py
+++ b/apps/patchwork/views/user.py
@@ -27,7 +27,7 @@ from patchwork.models import Project, Patch, Bundle, Person, \
          RegistrationRequest, UserProfile, UserPersonConfirmation, State
 from patchwork.forms import RegisterForm, LoginForm, MultiplePatchForm, \
          UserProfileForm, UserPersonLinkForm
-from patchwork.utils import Order, get_patch_ids, set_patches
+from patchwork.utils import Order, get_patch_ids
 from patchwork.filters import DelegateFilter
 from patchwork.paginator import Paginator
 from patchwork.views import generic_list