forms: update MuliplePatchForm to acocmodate for the new 'planning_to_review' field

Signed-off-by: andrepapoti <[email protected]>

Author: andrepapoti

patchwork/api/patch.py

@@ -428,7 +428,7 @@ def has_object_permission(self, request, view, obj):
         if 'planning_to_review' in data:
             for review_data in data:
                 user_id = review_data['user']
-                if request.user.id == reviewing_user:
+                if request.user.id == user_id:
                     return True
             detail = "Only the user can declare it's own intention to reviewing a patch"
             raise PermissionDenied(detail=detail)

patchwork/forms.py

@@ -216,7 +216,7 @@ class MultiplePatchForm(forms.Form):
         label='Archived',
     )
 
-    def __init__(self, project, *args, **kwargs):
+    def __init__(self, project, user=None, *args, **kwargs):
         super(MultiplePatchForm, self).__init__(*args, **kwargs)
         self.fields['delegate'] = OptionalModelChoiceField(
             queryset=_get_delegate_qs(project=project),
@@ -231,6 +231,20 @@ def __init__(self, project, *args, **kwargs):
             className='change-property-state',
             label='Change state',
         )
+        self.user = user
+        if self.user:
+            self.fields['review_status'] = OptionalBooleanField(
+                className='archive-patch-select',
+                choices=[
+                    ('*', 'no change'),
+                    ('True', 'Planning to review'),
+                    ('False', 'Not planning to review'),
+                ],
+                coerce=lambda x: x == 'True',
+                empty_value='*',
+                required=False,
+                initial='*',
+            )
 
     def save(self, instance, commit=True):
         opts = instance.__class__._meta
@@ -252,8 +266,27 @@ def save(self, instance, commit=True):
             if field.is_no_change(data[f.name]):
                 continue
 
+            if f.name == 'review_status':
+                if data[f.name]:
+                    self.instance.planning_to_review.add(self.user)
+                else:
+                    self.instance.planning_to_review.remove(self.user)
+                continue
+
             setattr(instance, f.name, data[f.name])
 
         if commit:
             instance.save()
         return instance
+
+    def review_status_only(self):
+        review_status_only = True
+        field_names = set(self.fields.keys())
+        field_names.discard({'review_status', 'action'})
+
+        for field_name in field_names:
+            data = self.data.get(field_name, '*')
+            if data != '*':
+                review_status_only = False
+
+        return review_status_only

patchwork/models.py

@@ -582,7 +582,7 @@ def save(self, *args, **kwargs):
 
         self.refresh_tag_counts()
 
-    def is_editable(self, user):
+    def is_editable(self, user, declare_interest_only=False):
         if not user.is_authenticated:
             return False
 
@@ -593,7 +593,8 @@ def is_editable(self, user):
         if self.project.is_editable(user):
             self._edited_by = user
             return True
-        return False
+
+        return declare_interest_only
 
     @staticmethod
     def filter_unique_checks(checks):

patchwork/views/__init__.py

@@ -242,7 +242,9 @@ def generic_list(
         if data and data.get('form', '') == 'patch-list-form':
             data_tmp = data
 
-        properties_form = MultiplePatchForm(project, data=data_tmp)
+        properties_form = MultiplePatchForm(
+            project, data=data_tmp, user=request.user
+        )
         create_bundle_form = CreateBundleForm()
 
     if request.method == 'POST' and data.get('form') == 'patch-list-form':
@@ -344,7 +346,7 @@ def process_multiplepatch_form(request, form, action, patches, context):
 
     changed_patches = 0
     for patch in patches:
-        if not patch.is_editable(request.user):
+        if not patch.is_editable(request.user, form.review_status_only()):
             errors.append(
                 "You don't have permissions to edit patch '%s'" % patch.name
             )