diff --git a/patchwork/templates/patchwork/series-detail.html b/patchwork/templates/patchwork/series-detail.html new file mode 100644 index 00000000..720df3be --- /dev/null +++ b/patchwork/templates/patchwork/series-detail.html @@ -0,0 +1,41 @@ +{% extends "base.html" %} + +{% load humanize %} +{% load syntax %} +{% load person %} +{% load patch %} +{% load static %} +{% load utils %} + +{% block title %}{{series.name}}{% endblock %} + +{% block body %} + +
+

{{ series.name }}

+
+ + + + + + + + + + + + + + + + + + +
Cover Letter{{ series.cover_letter.content|default:"No cover letter available" }}
Date{{ series.date }}
Submitter{{ series.submitter }}
Total{{ series.patches }}
+
+

Patches:

+
+{% include "patchwork/partials/patch-list.html" %} + +{% endblock %} diff --git a/patchwork/templates/patchwork/series-list.html b/patchwork/templates/patchwork/series-list.html new file mode 100644 index 00000000..6fea9513 --- /dev/null +++ b/patchwork/templates/patchwork/series-list.html @@ -0,0 +1,98 @@ +{% extends "base.html" %} + +{% load person %} +{% load static %} + +{% block title %}{{project.name}}{% endblock %} +{% block series_active %}active{% endblock %} + +{% block body %} + +{% load person %} +{% load listurl %} +{% load patch %} +{% load project %} +{% load static %} + +{% include "patchwork/partials/pagination.html" %} + + + + + + + +{% if user.is_authenticated and user.profile.show_ids %} + +{% endif %} + + + + + + + + + + + + + + + + +{% for series in page %} + +{% if user.is_authenticated and user.profile.show_ids %} + +{% endif %} + + + + + + + + +{% empty %} + + + +{% endfor %} + +
+ ID + + Series + + Version + + Cover Letter + + Patches + + Date + + Submitter +
+ + + + {{ series.name|default:"[no subject]"|truncatechars:100 }} + + + {{ series.version|default:"-"}} + + {% if series.cover_letter.content %} + ✓ + {% else %} + - + {% endif %} + {{ series.received_total}}{{ series.date|date:"Y-m-d" }}{{ series.submitter|personify:project }}
No series to display
+ +{% if page.paginator.count %} +{% include "patchwork/partials/pagination.html" %} +{% endif %} +{% endblock %} diff --git a/patchwork/templates/patchwork/submission.html b/patchwork/templates/patchwork/submission.html index 85e7be4b..90ee22b2 100644 --- a/patchwork/templates/patchwork/submission.html +++ b/patchwork/templates/patchwork/submission.html @@ -20,6 +20,22 @@

{{ submission.name }}

+
+ + next + +
+ +
+ + previous + +
+ diff --git a/patchwork/tests/views/test_series.py b/patchwork/tests/views/test_series.py new file mode 100644 index 00000000..c1f56fe8 --- /dev/null +++ b/patchwork/tests/views/test_series.py @@ -0,0 +1,51 @@ +# Patchwork - automated patch tracking system +# Copyright (C) 2012 Jeremy Kerr +# +# SPDX-License-Identifier: GPL-2.0-or-later + +from datetime import datetime as dt + +from django.test import TestCase +from django.urls import reverse + +from patchwork.models import Person +from patchwork.tests.utils import create_patch +from patchwork.tests.utils import create_cover +from patchwork.tests.utils import create_person +from patchwork.tests.utils import create_project +from patchwork.tests.utils import create_series +from patchwork.tests.utils import create_user + + +class SeriesList(TestCase): + def setUp(self): + self.project = create_project() + self.user = create_user() + self.person_1 = Person.objects.get(user=self.user) + self.person_2 = create_person() + self.series_1 = create_series(project=self.project) + self.series_2 = create_series(project=self.project) + create_cover(project=self.project, series=self.series_1) + + for i in range(5): + create_patch( + submitter=self.person_1, + project=self.project, + series=self.series_1, + date=dt(2014, 3, 16, 13, 4, 50, 155643), + ) + create_patch( + submitter=self.person_2, + project=self.project, + series=self.series_2, + date=dt(2014, 3, 16, 13, 4, 50, 155643), + ) + + def test_series_list(self): + requested_url = reverse( + 'series-list', + kwargs={'project_id': self.project.linkname}, + ) + response = self.client.get(requested_url) + + self.assertEqual(response.status_code, 200) diff --git a/patchwork/urls.py b/patchwork/urls.py index ecd3668d..75f4963f 100644 --- a/patchwork/urls.py +++ b/patchwork/urls.py @@ -32,10 +32,15 @@ path('admin/', admin.site.urls), path('', project_views.project_list, name='project-list'), path( - 'project//list/', + 'project//patches/', patch_views.patch_list, name='patch-list', ), + path( + 'project//series/', + series_views.series_list, + name='series-list', + ), path( 'project//bundles/', bundle_views.bundle_list, @@ -110,6 +115,11 @@ name='comment-redirect', ), # series views + path( + 'project//series//', + series_views.series_detail, + name='series-detail', + ), path( 'series//mbox/', series_views.series_mbox, diff --git a/patchwork/views/patch.py b/patchwork/views/patch.py index 54cf992c..4d0ec4eb 100644 --- a/patchwork/views/patch.py +++ b/patchwork/views/patch.py @@ -148,6 +148,20 @@ def patch_detail(request, project_id, msgid): context['related_same_project'] = related_same_project context['related_different_project'] = related_different_project + try: + context['previous_submission'] = Patch.objects.get( + series=patch.series, number=patch.number - 1 + ) + except Patch.DoesNotExist: + context['previous_submission'] = None + + try: + context['next_submission'] = Patch.objects.get( + series=patch.series, number=patch.number + 1 + ) + except Patch.DoesNotExist: + context['next_submission'] = None + return render(request, 'patchwork/submission.html', context) diff --git a/patchwork/views/series.py b/patchwork/views/series.py index a8892ae6..e76b2d3f 100644 --- a/patchwork/views/series.py +++ b/patchwork/views/series.py @@ -2,12 +2,18 @@ # Copyright (C) 2017 Stephen Finucane # # SPDX-License-Identifier: GPL-2.0-or-later +import collections from django.http import HttpResponse from django.shortcuts import get_object_or_404 +from django.shortcuts import render from patchwork.models import Series +from patchwork.models import Patch +from patchwork.models import Project +from patchwork.views import generic_list from patchwork.views.utils import series_to_mbox +from patchwork.paginator import Paginator def series_mbox(request, series_id): @@ -20,3 +26,59 @@ def series_mbox(request, series_id): ) return response + + +def series_detail(request, project_id, series_id): + series = get_object_or_404(Series, id=series_id) + + patches = Patch.objects.filter(series=series) + + context = generic_list( + request, + series.project, + 'series-detail', + view_args={ + 'project_id': project_id, + 'series_id': series_id, + }, + patches=patches, + ) + + context.update({'series': series}) + + return render(request, 'patchwork/series-detail.html', context) + + +def series_list(request, project_id): + project = get_object_or_404(Project, linkname=project_id) + context = {} + series_list = ( + Series.objects.filter(project=project) + .only( + 'submitter', + 'project', + 'version', + 'name', + 'date', + 'id', + ) + .select_related('project') + .order_by('date') + ) + + paginator = Paginator(request, series_list) + context.update( + { + 'project': project, + 'projects': Project.objects.all(), + 'series_list': series_list, + 'page': paginator.current_page, + 'list_view': { + 'view': 'series-list', + 'view_params': {'project_id': project.linkname}, + 'params': collections.OrderedDict(), + }, + } + ) + + return render(request, 'patchwork/series-list.html', context) diff --git a/releasenotes/notes/add_series_list_view-bf219022216fea6a.yaml b/releasenotes/notes/add_series_list_view-bf219022216fea6a.yaml new file mode 100644 index 00000000..e3e0519b --- /dev/null +++ b/releasenotes/notes/add_series_list_view-bf219022216fea6a.yaml @@ -0,0 +1,11 @@ +--- +prelude: > + Some projects can have hundreds of patches actives at once, by giving the user + the ability to have an overview of all of the series makes knowing what's the + current state of a project much more simple. +features: + - | + Add series-list view, a view containing all of the series for a project and that also + implements the SeriesBulkUpdatePatchesForm, allowing the user to edit all of the patches + within a series using the web ui. + Add series-detail view, a view containing details about a series and all of it's patches diff --git a/templates/base.html b/templates/base.html index 747da592..e3de3daf 100644 --- a/templates/base.html +++ b/templates/base.html @@ -48,6 +48,12 @@ {% block navbarmenu %} {% if project %}
Message ID