[RFC] A new page listing the user's patches that are waiting for feedback

Message ID	1301950805.2613.68.camel@feioso
State	RFC
Headers	show Return-Path: <patchwork-bounces+incoming=patchwork.ozlabs.org@lists.ozlabs.org> Subject: [RFC] A new page listing the user's patches that are waiting for feedback From: Guilherme Salgado <guilherme.salgado@linaro.org> To: patchwork <patchwork@lists.ozlabs.org> Date: Mon, 04 Apr 2011 18:00:05 -0300 Message-ID: <1301950805.2613.68.camel@feioso> Mime-Version: 1.0 Precedence: list Content-Type: multipart/mixed; boundary="===============6467021911505236512==" Errors-To: patchwork-bounces+incoming=patchwork.ozlabs.org@lists.ozlabs.org Sender: patchwork-bounces+incoming=patchwork.ozlabs.org@lists.ozlabs.org

diff --git a/apps/patchwork/models.py b/apps/patchwork/models.py index e4df2c5..7e2905d 100644 --- a/apps/patchwork/models.py +++ b/apps/patchwork/models.py @@ -100,6 +100,11 @@ class UserProfile(models.Model): def n_todo_patches(self): return self.todo_patches().count() + def submitted_patches_waiting_feedback(self): + people = Person.objects.filter(user=self) + states = State.objects.filter(action_required=True) + return Patch.objects.filter(submitter__in=people, state__in=states) + def todo_patches(self, project = None): # filter on project, if necessary diff --git a/apps/patchwork/tests/models.py b/apps/patchwork/tests/models.py new file mode 100644 index 0000000..99d9d20 --- /dev/null +++ b/apps/patchwork/tests/models.py @@ -0,0 +1,37 @@ + +from django.test import TestCase + +from patchwork.models import State +from patchwork.tests.factory import ObjectFactory + + +class UserProfileTestCase(TestCase): + + def setUp(self): + super(UserProfileTestCase, self).setUp() + self.factory = ObjectFactory() + + def test_submitted_patches_waiting_feedback(self): + # Create two people linked to the same user. + person = self.factory.makePerson(is_user=True) + profile = person.user.get_profile() + person2 = self.factory.makePerson(is_user=False) + person2.user = person.user + person2.save() + + # Create 4 patches, where the first three have a person linked to our + # newly created user as the submitter but only the first two ones are + # in a state that needs action. + patch1 = self.factory.makePatch(submitter=person) + patch2 = self.factory.makePatch(submitter=person2) + patch3 = self.factory.makePatch(submitter=person2) + patch3.state = State.objects.get(name='Accepted') + patch3.save() + patch4 = self.factory.makePatch() + + # Here we see that UserProfile.submitted_patches_waiting_feedback() + # only returns the two patches that are in a state that requires + # action and that have been submitted by a person linked to that + # profile. + self.assertEquals([patch1, patch2], + list(profile.submitted_patches_waiting_feedback())) diff --git a/apps/patchwork/urls.py b/apps/patchwork/urls.py index b49b4e1..b5855da 100644 --- a/apps/patchwork/urls.py +++ b/apps/patchwork/urls.py @@ -33,6 +33,7 @@ urlpatterns = patterns('', # logged-in user stuff (r'^user/$', 'patchwork.views.user.profile'), + (r'^user/submitted/$', 'patchwork.views.user.submitted_patches_list'), (r'^user/todo/$', 'patchwork.views.user.todo_lists'), (r'^user/todo/(?P<project_id>[^/]+)/$', 'patchwork.views.user.todo_list'), diff --git a/apps/patchwork/views/user.py b/apps/patchwork/views/user.py index 1ae3c2d..dd55cf7 100644 --- a/apps/patchwork/views/user.py +++ b/apps/patchwork/views/user.py @@ -109,6 +109,18 @@ def unlink(request, person_id): @login_required +def submitted_patches_list(request): + profile = request.user.get_profile() + patches = profile.submitted_patches_waiting_feedback() + + context = generic_list( + request, None, 'patchwork.views.user.submitted_patches_list', + patches=patches) + + return render_to_response('patchwork/submitted-list.html', context) + + +@login_required def todo_lists(request): todo_lists = [] diff --git a/templates/patchwork/profile.html b/templates/patchwork/profile.html index 44df921..be65211 100644 --- a/templates/patchwork/profile.html +++ b/templates/patchwork/profile.html @@ -36,6 +36,17 @@ Contributor to </div> <div class="box"> + <h2>Patches you submitted</h2> +{% if user.get_profile.submitted_patches_waiting_feedback.count %} + <p>There are <a href="{% url patchwork.views.user.submitted_patches_list %}"> + {{ user.get_profile.submitted_patches_waiting_feedback.count }} patches submitted by you</a> + that haven't been reviewed yet.</p> +{% else %} + <p>There are no patches submitted by you that haven't been reviewed.</p> +{% endif %} +</div> + +<div class="box"> <h2>Linked email addresses</h2> <p>The following email addresses are associated with this patchwork account. Adding alternative addresses allows patchwork to group contributions that diff --git a/templates/patchwork/submitted-list.html b/templates/patchwork/submitted-list.html new file mode 100644 index 0000000..51c8603 --- /dev/null +++ b/templates/patchwork/submitted-list.html @@ -0,0 +1,14 @@ +{% extends "base.html" %} + +{% load person %} + +{% block title %}{{ user }}'s submitted patches{% endblock %} +{% block heading %}{{user}}'s submitted patches{% endblock %} + +{% block body %} + +<p>TODO</p> + +{% include "patchwork/patch-list.html" %} + +{% endblock %}

[RFC] A new page listing the user's patches that are waiting for feedback

Commit Message

Comments

Patch