Add done checkbox to parent issue page

deploy/pip_packages.txt

@@ -27,6 +27,7 @@ django-parsley==0.0.2a0
 django-waffle==0.9.1
 Markdown==2.3.1
 -e git+git://github.com/aptivate/aptivate-monkeypatch.git@ed4f821d8d57ba181c418b8d78dfd8bca70d6817#egg=aptivate_monkeypatch
+decorators==0.1
 
 # for search
 django-haystack==2.1.0
@@ -51,6 +52,6 @@ django-debug-toolbar==0.9.4
 # TODO: remove when bug fix release is available
 # working around bug
 # https://bitbucket.org/logilab/astroid/issue/3/error-after-upgrade-to-pylint-10
-hg+https://bitbucket.org/logilab/astroid
+astroid==1.2.1
 # pylint 1.4 does not support python 2.6, so until we upgrade to 2.7 we need
 pylint<1.3

django/econsensus/publicweb/custom_decorators.py

@@ -0,0 +1,20 @@
+from django.http import Http404
+from actionitems.models import ActionItem
+import decorators
+
+
+class is_org_member(decorators.FuncDecorator):
+
+    def decorate_func(self, func, *args, **kwargs):
+        def wrapped_func(self, request, *args, **kwargs):
+            item = self.get_object()
+            if(isinstance(item, ActionItem)):
+                org = item.origin.organization
+            else:
+                org = item.organization
+
+            if org in request.user.organization_set.all():
+                return func(self, request, *args, **kwargs)
+            else:
+                raise Http404
+        return wrapped_func

django/econsensus/publicweb/single_action_views.py

@@ -0,0 +1,80 @@
+from django.http import HttpResponseRedirect
+from django.shortcuts import get_object_or_404
+from django.views.generic.base import View
+
+from actionitems.models import ActionItem
+from guardian.mixins import LoginRequiredMixin
+from notification import models as notification
+from signals.management import DECISION_CHANGE
+
+from .custom_decorators import is_org_member
+from .models import Decision
+
+
+class BaseSingleActionView(LoginRequiredMixin, View):
+    """ SingleActionViews are views used to perform a single, simple
+        action such as marking an item as done. This used with a
+        redirection to provide quick, one-click actions that do
+        not require javascript.
+
+        - Users need to provide a URL route to the single action view;
+        - Descendant classes should implement a single 'do_action'
+        method to perform the action;
+        - Requests are expected to contains a GET parameter 'next' then the
+        user will be redirected to the given URL.
+    """
+    @is_org_member
+    def get(self, request, *args, **kwargs):
+        self.do_action()
+        return HttpResponseRedirect(request.GET['next'])
+
+
+class BaseWatcherView(BaseSingleActionView):
+    """ Base single action view for add/remove watcher views """
+    def get_object(self):
+        object_id = self.kwargs['decision_id']
+        decision = get_object_or_404(Decision, pk=object_id)
+        return decision
+
+    def get_user(self):
+        return self.request.user
+
+
+class BaseActionItemView(BaseSingleActionView):
+    """ Base single action view for set/unset action item done views """
+    def get_object(self):
+        object_id = self.kwargs['actionitem_id']
+        actionitem = get_object_or_404(ActionItem, pk=object_id)
+        return actionitem
+
+
+class AddWatcher(BaseWatcherView):
+    """ Single action view used to add a new watcher to a decision """
+    def do_action(self):
+        decision = self.get_object()
+        user = self.get_user()
+        notification.observe(decision, user, DECISION_CHANGE)
+
+
+class RemoveWatcher(BaseWatcherView):
+    """ Single action view used to remove a watcher from a decision """
+    def do_action(self):
+        decision = self.get_object()
+        user = self.get_user()
+        notification.stop_observing(decision, user)
+
+
+class SetActionItemDone(BaseActionItemView):
+    """ Single action view used to set an action item as done """
+    def do_action(self):
+        actionitem = self.get_object()
+        actionitem.done = True
+        actionitem.save()
+
+
+class UnsetActionItemDone(BaseActionItemView):
+    """ Single action view used to unset an action item's done status """
+    def do_action(self):
+        actionitem = self.get_object()
+        actionitem.done = False
+        actionitem.save()

django/econsensus/publicweb/templates/actionitem_detail_snippet.html

@@ -26,6 +26,11 @@
 		 {% else %}{% trans "No deadline" %}
 		 {% endif %}
 	       </li>
+	       <li>
+	           <a href="{% if object.done %}{% url 'unset_actionitem_done' object.id %}{% else %}{% url 'set_actionitem_done' object.id %}{% endif %}?next={{ request.path_info }}" aria-label="{% if object.done %}Mark item as not done.{% else %}Mark item as done{% endif %}">
+                   {% if object.done %}&#x2611;{% else %}&#x2610;{% endif %} {% trans "Done" %} 
+               </a>
+	       </li>
 	     </ul>
 	   </div>
 

django/econsensus/publicweb/templates/decision_list.html

@@ -63,13 +63,27 @@
                     <tbody>
                     {% for object in object_list %}
                         <tr>
-                            {% if tab != 'actionitems' %}
+                            {% if tab == 'actionitems' %}
+								{% switch "actionitems" %}
+									<td class="id"><a href="{% url "publicweb_item_detail" object.origin.id %}#act_id_{{ object.id }}">{{ object.id }}</a></td>
+									<td>
+	                                    <a href="{% if object.done %}{% url 'unset_actionitem_done' object.id %}{% else %}{% url 'set_actionitem_done' object.id %}{% endif %}?next={{ request.path_info }}" aria-label="{% if object.done %}Mark item as not done.{% else %}Mark item as done{% endif %}">
+	                                        {% if object.done %}&#x2611;{% else %}&#x2610;{% endif %}
+	                                    </a>
+                                    </td>
+									<td class="excerpt"><a href="{% url "publicweb_item_detail" object.origin.id %}#act_id_{{ object.id }}">{{ object.description|get_excerpt }}</a></td>
+									<td><a href="{% url "publicweb_item_detail" object.origin.id %}#act_id_{{ object.id }}">{{ object.responsible }}</a></td>
+									<td><a href="{% url "publicweb_item_detail" object.origin.id %}#act_id_{{ object.id }}">{{ object.deadline }}</a></td>
+									<td><input id="id_done" type="checkbox" name="done" {% if object.done %}checked{% endif %} disabled/></td>
+									<td class="id parent-id"><a href="{{ object.origin.get_absolute_url }}"><span class="iconified">{{ object.origin.id }}</span></a></td>
+								{% endswitch %}
+							{% else %}
                                 <td class="id"><a href="{% url 'publicweb_item_detail' object.id %}"><span class="iconified">{{ object.id }}</span></a></td>
                                 <td>
                                     <a href="{% if request.user|is_watching:object %}{% url 'remove_watcher' object.id %}{% else %}{% url 'add_watcher' object.id %}{% endif %}?next={{ request.path_info }}">
                                         <input type="checkbox"{% if request.user|is_watching:object %} checked="True"{% endif %} />
                                     </a>
-                                 </td>
+                                </td>
 				                <td class="excerpt"><a href="{% url 'publicweb_item_detail' object.id %}">{{ object.excerpt }}	</a></td>
 				                {% if tab == 'decision' %}
 				                    <td><a href="{% url 'publicweb_item_detail' object.id %}">{{ object.decided_date }}</a></td>
@@ -83,16 +97,6 @@
 				                    <td><a href="{% url 'publicweb_item_detail' object.id %}">{{ object.last_modified|timesince }} ago</a></td>
                                 {% endif %}
                             {% endif %}
-                            {% if tab == 'actionitems' %}
-															{% switch "actionitems" %}
-															<td class="id"><a href="{% url "publicweb_item_detail" object.origin.id %}#act_id_{{ object.id }}">{{ object.id }}</a></td>
-															<td class="excerpt"><a href="{% url "publicweb_item_detail" object.origin.id %}#act_id_{{ object.id }}">{{ object.description|get_excerpt }}</a></td>
-															<td><a href="{% url "publicweb_item_detail" object.origin.id %}#act_id_{{ object.id }}">{{ object.responsible }}</a></td>
-															<td><a href="{% url "publicweb_item_detail" object.origin.id %}#act_id_{{ object.id }}">{{ object.deadline }}</a></td>
-															<td><input id="id_done" type="checkbox" name="done" {% if object.done %}checked{% endif %} disabled/></td>
-															<td class="id parent-id"><a href="{{ object.origin.get_absolute_url }}"><span class="iconified">{{ object.origin.id }}</span></a></td>
-															{% endswitch %}
-                            {% endif %}
                         </tr>
                     {% endfor %}
                     </tbody>

django/econsensus/publicweb/tests/actionitems_view_test.py

@@ -1,7 +1,9 @@
-from django.utils.unittest import TestCase
-from django.test.client import RequestFactory
+from django.contrib.auth.models import User, AnonymousUser
 from django.core.urlresolvers import reverse, resolve
-from django.contrib.auth.models import User
+from django.http import Http404
+from django.test.client import RequestFactory
+from django.utils.unittest import TestCase
+
 from BeautifulSoup import BeautifulSoup
 from waffle import Switch
 
@@ -11,9 +13,12 @@
 
 from publicweb.forms import (EconsensusActionItemCreateForm,
                              EconsensusActionItemUpdateForm)
+from publicweb.single_action_views import SetActionItemDone, UnsetActionItemDone
 from publicweb.views import (EconsensusActionitemCreateView,
                              EconsensusActionitemUpdateView,
                              EconsensusActionitemListView)
+from django_dynamic_fixture import G
+from publicweb.models import Decision
 
 
 class ActionitemsViewTestFast(TestCase):
@@ -221,3 +226,109 @@ def test_list_wrongorg(self):
         response.render()
         soup = BeautifulSoup(str(response.content))
         assert soup.find("p", {"class": "wrongorg"})
+
+    def test_set_done_view_requires_user_to_be_logged_in(self):
+        actionitem = ActionItem.objects.create()
+        user = AnonymousUser()
+
+        view = SetActionItemDone()
+        view.get_object = lambda: actionitem
+
+        request = RequestFactory().get('/', {'next': reverse('actionitem_list', args=[self.bettysorg.slug])})
+        request.user = user
+
+        response = view.dispatch(request)
+
+        self.assertEqual('/accounts/login/?next=/%3Fnext%3D%252Fcountry-critters%252Factionitem%252Flist%252F', response['Location'])
+
+    def test_remove_watcher_view_requires_user_to_be_logged_in(self):
+        actionitem = ActionItem.objects.create()
+        user = AnonymousUser()
+
+        view = UnsetActionItemDone()
+        view.get_object = lambda: actionitem
+
+        request = RequestFactory().get('/', {'next': reverse('actionitem_list', args=[self.bettysorg.slug])})
+        request.user = user
+
+        response = view.dispatch(request)
+
+        self.assertEqual('/accounts/login/?next=/%3Fnext%3D%252Fcountry-critters%252Factionitem%252Flist%252F', response['Location'])
+
+    def test_action_item_set_done_sets_item_done(self):
+        decision = G(Decision, organization=self.bettysorg)
+        actionitem = ActionItem.objects.create(origin=decision)
+        user = self.betty
+
+        view = SetActionItemDone()
+        view.get_object = lambda: actionitem
+
+        request = RequestFactory().get('/', {'next': reverse('actionitem_list', args=[self.bettysorg.slug])})
+        request.user = user
+
+        view.dispatch(request)
+
+        self.assertTrue(actionitem.done)
+
+    def test_action_item_unset_done_sets_item_not_done(self):
+        decision = G(Decision, organization=self.bettysorg)
+        actionitem = ActionItem.objects.create(done=True, origin=decision)
+        user = self.betty
+
+        view = UnsetActionItemDone()
+        view.get_object = lambda: actionitem
+
+        request = RequestFactory().get('/', {'next': reverse('actionitem_list', args=[self.bettysorg.slug])})
+        request.user = user
+
+        view.dispatch(request, actionitem_id=actionitem.id)
+
+        self.assertFalse(actionitem.done)
+
+    def test_action_item_set_done_for_non_existant_item_returns_404(self):
+        decision = G(Decision, organization=self.bettysorg)
+        actionitem = ActionItem.objects.create(origin=decision)
+        user = self.betty
+
+        view = SetActionItemDone()
+
+        request = RequestFactory().get('/', {'next': reverse('actionitem_list', args=[self.bettysorg.slug])})
+        request.user = user
+
+        self.assertRaises(Http404, view.dispatch, request, actionitem_id=actionitem.id + 1)
+
+    def test_action_item_unset_done_for_non_existant_item_returns_404(self):
+        decision = G(Decision, organization=self.bettysorg)
+        actionitem = ActionItem.objects.create(origin=decision)
+        user = self.betty
+
+        view = UnsetActionItemDone()
+
+        request = RequestFactory().get('/', {'next': reverse('actionitem_list', args=[self.bettysorg.slug])})
+        request.user = user
+
+        self.assertRaises(Http404, view.dispatch, request, actionitem_id=actionitem.id + 1)
+
+    def test_action_item_set_done_for_item_for_different_org_returns_404(self):
+        decision = G(Decision)
+        actionitem = ActionItem.objects.create(origin=decision)
+        user = self.betty
+
+        view = SetActionItemDone()
+
+        request = RequestFactory().get('/', {'next': reverse('actionitem_list', args=[self.bettysorg.slug])})
+        request.user = user
+
+        self.assertRaises(Http404, view.dispatch, request, actionitem_id=actionitem.id + 1)
+
+    def test_action_item_unset_done_for_item_for_different_org_returns_404(self):
+        decision = G(Decision)
+        actionitem = ActionItem.objects.create(origin=decision)
+        user = self.betty
+
+        view = UnsetActionItemDone()
+
+        request = RequestFactory().get('/', {'next': reverse('actionitem_list', args=[self.bettysorg.slug])})
+        request.user = user
+
+        self.assertRaises(Http404, view.dispatch, request, actionitem_id=actionitem.id + 1)