devilry 6.5.2__tar.gz → 6.6.1__tar.gz

{devilry-6.5.2 → devilry-6.6.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: devilry
-Version: 6.5.2
+Version: 6.6.1
 Summary: A system for handling electronic deliveries. See https://github.com/devilry/devilry-django.
 Author: Tor Johansen, Bendik Opstad, Vegard Angell, Magne Westlie, Ilya Kostolomov, Christian Tryti, Rebekka Mørken, Stian Julseth, Åsmund J. Rosendahl
 Author-email: Espen Angell Kristiansen <post@appresso.no>
@@ -38,7 +38,7 @@ Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: Python
 Requires-Python: >=3.10.0
 Requires-Dist: arrow<0.13.0,>=0.12.0
-Requires-Dist: cradmin-legacy<7.0.0,>=6.2.0
+Requires-Dist: cradmin-legacy<7.0.0,>=6.3.1
 Requires-Dist: django-allauth[socialaccount]>=0.62.0
 Requires-Dist: django-crispy-forms<1.15.0,>=1.14.0
 Requires-Dist: django-rq
@@ -48,7 +48,7 @@ Requires-Dist: gunicorn>=23.0.0
 Requires-Dist: html-sanitizer
 Requires-Dist: html2text
 Requires-Dist: ievv-opensource<13.0.0,>=12.0.0
-Requires-Dist: markdown<3.4.0,>=3.3.0
+Requires-Dist: markdown
 Requires-Dist: psycopg
 Requires-Dist: pycountry>=18
 Requires-Dist: pygments<2.16.0,>=2.15.0
@@ -86,6 +86,7 @@ Requires-Dist: model-bakery; extra == 'test'
 Requires-Dist: pytest; extra == 'test'
 Requires-Dist: pytest-django; extra == 'test'
 Requires-Dist: pytest-env; extra == 'test'
+Requires-Dist: pytest-xdist[psutil]; extra == 'test'
 Description-Content-Type: text/markdown
 
 # devilry
@@ -260,6 +261,7 @@ nvm use 14    # May need to run "nvm install 14" first
 ievv buildstatic --npm-clean-node-modules
 ```
 
+
 ### Build docs
 Docs are built on https://readthedocs.org/projects/devilry/ each time a branch is pushed,
 but if you are making larger changes or need to debug build issues, you can build it
@@ -282,9 +284,20 @@ docker compose down -v
 
 https://devilry.readthedocs.io
 
+## Pre-release
+
+To ensure a clean commit, do the following:
+- Create a PR on GitHub from the working branch
+- Select `Squash and Merge` and update the commit-message, we use Conventional Commits to set the version later on, so start the commit with the proper keywords (i.e `feat`, `fix`, etc): https://www.conventionalcommits.org/en/v1.0.0/#specification
+- Once the PR is merged into master you can continue with the release.
+
+
+Before releasing, you should create a PR on GitHub and squash-merge it into master. Ensure the commit starts with 
+the compatible type for Conventional Commits (https://www.conventionalcommits.org/en/v1.0.0/#specification) (i.e `feat`, `fix`, etc)
+
 ## Release
 
-### Translations
+### Step 1: Translations
 
 To translate new texts, do the following:
 
@@ -294,7 +307,7 @@ To translate new texts, do the following:
 - Commit the changes
 
 
-### Update docs
+### Step 2: Update docs (for official readthedocs)
 Create a ``not_for_deploy/docs/sysadmin/migrationguides/migrate-to-<NEWVERSION>.rst``
 with update instructions for sysadmins. See the previous version for example. Skeleton:
 
@@ -348,7 +361,7 @@ Updates/changes
 ```
 
 
-### Set version and build staticfiles
+### Step 3: Set version and build staticfiles
 
 First make sure you have NO UNCOMITTED CHANGES!
 
@@ -373,7 +386,7 @@ tools/release/prepare-release.py prepare --prerelease rc --apply
 ```
 
 
-### NOTE (release):
+#### NOTE (release):
 
 - `cz bump` automatically updates CHANGELOG.md, updates version file(s), commits the change and tags the release commit.
 - If you are unsure about what `cz bump` will do, run it with `--dry-run`. You can use
@@ -388,16 +401,12 @@ tools/release/prepare-release.py prepare --prerelease rc --apply
   commit.
 - The `cz` command comes from `commitizen` (install documented above).
 
-### What if the release fails?
+#### What if the release fails?
 
 See _How to revert a bump_ in the [commitizen FAQ](https://commitizen-tools.github.io/commitizen/faq/#how-to-revert-a-bump).
 
 
-### Migrationguide and changelog (for official readthedocs)
-- Add a migration guide to not_for_deploy/docs/sysadmin/migrationguides/
-- Add a changelog to not_for_deploy/docs/user/changelog/
-
-### Release to pypi:
+### Step 4: Release to pypi
 
 ```bash
 hatch build -t sdist

{devilry-6.5.2 → devilry-6.6.1}/README.md

@@ -170,6 +170,7 @@ nvm use 14    # May need to run "nvm install 14" first
 ievv buildstatic --npm-clean-node-modules
 ```
 
+
 ### Build docs
 Docs are built on https://readthedocs.org/projects/devilry/ each time a branch is pushed,
 but if you are making larger changes or need to debug build issues, you can build it
@@ -192,9 +193,20 @@ docker compose down -v
 
 https://devilry.readthedocs.io
 
+## Pre-release
+
+To ensure a clean commit, do the following:
+- Create a PR on GitHub from the working branch
+- Select `Squash and Merge` and update the commit-message, we use Conventional Commits to set the version later on, so start the commit with the proper keywords (i.e `feat`, `fix`, etc): https://www.conventionalcommits.org/en/v1.0.0/#specification
+- Once the PR is merged into master you can continue with the release.
+
+
+Before releasing, you should create a PR on GitHub and squash-merge it into master. Ensure the commit starts with 
+the compatible type for Conventional Commits (https://www.conventionalcommits.org/en/v1.0.0/#specification) (i.e `feat`, `fix`, etc)
+
 ## Release
 
-### Translations
+### Step 1: Translations
 
 To translate new texts, do the following:
 
@@ -204,7 +216,7 @@ To translate new texts, do the following:
 - Commit the changes
 
 
-### Update docs
+### Step 2: Update docs (for official readthedocs)
 Create a ``not_for_deploy/docs/sysadmin/migrationguides/migrate-to-<NEWVERSION>.rst``
 with update instructions for sysadmins. See the previous version for example. Skeleton:
 
@@ -258,7 +270,7 @@ Updates/changes
 ```
 
 
-### Set version and build staticfiles
+### Step 3: Set version and build staticfiles
 
 First make sure you have NO UNCOMITTED CHANGES!
 
@@ -283,7 +295,7 @@ tools/release/prepare-release.py prepare --prerelease rc --apply
 ```
 
 
-### NOTE (release):
+#### NOTE (release):
 
 - `cz bump` automatically updates CHANGELOG.md, updates version file(s), commits the change and tags the release commit.
 - If you are unsure about what `cz bump` will do, run it with `--dry-run`. You can use
@@ -298,16 +310,12 @@ tools/release/prepare-release.py prepare --prerelease rc --apply
   commit.
 - The `cz` command comes from `commitizen` (install documented above).
 
-### What if the release fails?
+#### What if the release fails?
 
 See _How to revert a bump_ in the [commitizen FAQ](https://commitizen-tools.github.io/commitizen/faq/#how-to-revert-a-bump).
 
 
-### Migrationguide and changelog (for official readthedocs)
-- Add a migration guide to not_for_deploy/docs/sysadmin/migrationguides/
-- Add a changelog to not_for_deploy/docs/user/changelog/
-
-### Release to pypi:
+### Step 4: Release to pypi
 
 ```bash
 hatch build -t sdist

devilry-6.6.1/devilry/__init__.py

@@ -0,0 +1 @@
+__version__ = "6.6.1"

{devilry-6.5.2 → devilry-6.6.1}/devilry/devilry_admin/templates/devilry_admin/period/examiners/overview.django.html

@@ -50,8 +50,3 @@
 
     {{ block.super }}
 {% endblock content %}
-
-
-{% block no-items-paragraph-contents %}
-    {% trans "You have no examiners. Use the buttons above to add examiners." %}
-{% endblock no-items-paragraph-contents %}

{devilry-6.5.2 → devilry-6.6.1}/devilry/devilry_admin/templates/devilry_admin/period/students/overview.django.html

@@ -51,7 +51,3 @@
     {{ block.super }}
 {% endblock content %}
 
-
-{% block no-items-paragraph-contents %}
-    {% trans "You have no students. Use the buttons above to add students." %}
-{% endblock no-items-paragraph-contents %}

{devilry-6.5.2 → devilry-6.6.1}/devilry/devilry_admin/tests/period/test_examiners.py

@@ -1,9 +1,10 @@
 from unittest import mock
+
+from cradmin_legacy import cradmin_testhelpers
 from django import test
 from django.conf import settings
 from django.contrib import messages
 from django.http import Http404
-from cradmin_legacy import cradmin_testhelpers
 from model_bakery import baker
 
 from devilry.apps.core.models import RelatedExaminer
@@ -118,8 +119,10 @@ class TestOverview(test.TestCase, cradmin_testhelpers.TestCaseMixin):
         testperiod = baker.make("core.Period")
         mockresponse = self.mock_http200_getrequest_htmls(cradmin_role=testperiod)
         self.assertEqual(
-            "You have no examiners. Use the buttons above to add examiners.",
-            mockresponse.selector.one(".cradmin-legacy-listing-no-items-message").alltext_normalized,
+            "Found 0 of 0 examiners",
+            mockresponse.selector.one(
+                ".devilry-with-match-result-listbuilder-itemvalue-titledescription-title"
+            ).alltext_normalized,
         )
 
     def test_default_ordering(self):
@@ -203,7 +206,7 @@ class TestOverview(test.TestCase, cradmin_testhelpers.TestCaseMixin):
     def test_querycount(self):
         testperiod = baker.make("core.Period")
         baker.make("core.RelatedExaminer", period=testperiod, _quantity=30)
-        with self.assertNumQueries(4):
+        with self.assertNumQueries(6):
             self.mock_getrequest(cradmin_role=testperiod)
 
 

{devilry-6.5.2 → devilry-6.6.1}/devilry/devilry_admin/tests/period/test_manage_tags/test_manage_tags.py

@@ -1,19 +1,17 @@
 # -*- coding: utf-8 -*-
 
 
+from unittest import mock
+
+from cradmin_legacy import cradmin_testhelpers
 from django import test
-from django.contrib import messages
 from django.conf import settings
+from django.contrib import messages
 from django.http import Http404
-
-from cradmin_legacy import cradmin_testhelpers
-
-from unittest import mock
 from model_bakery import baker
 
-from devilry.apps.core.models import RelatedExaminer
+from devilry.apps.core.models import PeriodTag, RelatedExaminer
 from devilry.devilry_admin.views.period.manage_tags import manage_tags
-from devilry.apps.core.models import PeriodTag
 from devilry.devilry_dbcache.customsql import AssignmentGroupDbCacheCustomSql
 
 
@@ -418,7 +416,7 @@ class TestPeriodTagListbuilderView(test.TestCase, cradmin_testhelpers.TestCaseMi
         testperiodtag1.relatedexaminers.add(baker.make("core.RelatedExaminer", period=testperiod))
         testperiodtag2.relatedexaminers.add(baker.make("core.RelatedExaminer", period=testperiod))
         testperiodtag3.relatedexaminers.add(baker.make("core.RelatedExaminer", period=testperiod))
-        with self.assertNumQueries(4):
+        with self.assertNumQueries(6):
             self.mock_http200_getrequest_htmls(cradmin_role=testperiod, requestuser=testuser)
 
 

{devilry-6.5.2 → devilry-6.6.1}/devilry/devilry_admin/tests/period/test_students.py

@@ -1,9 +1,10 @@
 from unittest import mock
+
+from cradmin_legacy import cradmin_testhelpers
 from django import test
 from django.conf import settings
 from django.contrib import messages
 from django.http import Http404
-from cradmin_legacy import cradmin_testhelpers
 from model_bakery import baker
 
 from devilry.apps.core.models import RelatedStudent
@@ -114,8 +115,10 @@ class TestOverview(test.TestCase, cradmin_testhelpers.TestCaseMixin):
         testperiod = baker.make("core.Period")
         mockresponse = self.mock_http200_getrequest_htmls(cradmin_role=testperiod)
         self.assertEqual(
-            "You have no students. Use the buttons above to add students.",
-            mockresponse.selector.one(".cradmin-legacy-listing-no-items-message").alltext_normalized,
+            "Found 0 of 0 students",
+            mockresponse.selector.one(
+                ".devilry-with-match-result-listbuilder-itemvalue-titledescription-title"
+            ).alltext_normalized,
         )
 
     def test_default_ordering(self):
@@ -200,7 +203,7 @@ class TestOverview(test.TestCase, cradmin_testhelpers.TestCaseMixin):
     def test_querycount(self):
         testperiod = baker.make("core.Period")
         baker.make("core.RelatedStudent", period=testperiod, _quantity=30)
-        with self.assertNumQueries(5):
+        with self.assertNumQueries(7):
             self.mock_getrequest(cradmin_role=testperiod)
 
 

{devilry-6.5.2 → devilry-6.6.1}/devilry/devilry_admin/views/assignment/examiners/overview.py

@@ -1,14 +1,14 @@
 # -*- coding: utf-8 -*-
 
 
-from django.http import Http404
-from django.utils.translation import gettext_lazy
 from cradmin_legacy import crapp
 from cradmin_legacy.crinstance import reverse_cradmin_url
 from cradmin_legacy.viewhelpers.listbuilder.itemframe import DefaultSpacingItemFrame
 from cradmin_legacy.viewhelpers.listbuilder.lists import RowList
+from django.http import Http404
+from django.utils.translation import gettext_lazy
 
-from devilry.apps.core.models import RelatedExaminer, AssignmentGroup
+from devilry.apps.core.models import AssignmentGroup, RelatedExaminer
 from devilry.devilry_admin.cradminextensions.listbuilder import listbuilder_relatedexaminer
 from devilry.devilry_cradmin import devilry_listbuilder
 from devilry.devilry_cradmin.devilry_listfilter.utils import WithResultValueRenderable
@@ -84,16 +84,16 @@ class Overview(listbuilder_relatedexaminer.ListViewBase):
     def get_unfiltered_queryset_for_role(self, role):
         assignment = role
         period = assignment.period
+        all_queryset = RelatedExaminer.objects.filter(period=period, active=True)
+
         queryset = (
-            RelatedExaminer.objects.filter(period=period)
-            .select_related("user")
+            all_queryset.select_related("user")
             .annotate_with_number_of_groups_on_assignment(assignment=assignment)
             .extra_annotate_with_number_of_candidates_on_assignment(assignment=assignment)
-            .exclude(active=False)
         )
 
         # Set unfiltered count on self.
-        self.num_total = queryset.count()
+        self.num_total = all_queryset.count()
         return queryset
 
     def get_queryset_for_role(self, role):

{devilry-6.5.2 → devilry-6.6.1}/devilry/devilry_admin/views/period/examiners.py

@@ -1,15 +1,18 @@
+from cradmin_legacy import crapp
+from cradmin_legacy.crispylayouts import DangerSubmit
+from cradmin_legacy.viewhelpers.listbuilder.itemframe import DefaultSpacingItemFrame
+from cradmin_legacy.viewhelpers.listbuilder.lists import RowList
 from django.contrib import messages
 from django.http import Http404
 from django.utils.translation import gettext_lazy
-from cradmin_legacy import crapp
-from cradmin_legacy.crispylayouts import DangerSubmit
 
 from devilry.apps.core.models import RelatedExaminer
-from devilry.devilry_account.models import User, PermissionGroup
+from devilry.devilry_account.models import PermissionGroup, User
 from devilry.devilry_admin.cradminextensions.listbuilder import listbuilder_relatedexaminer
 from devilry.devilry_admin.cradminextensions.listfilter import listfilter_relateduser
 from devilry.devilry_admin.views.common import bulkimport_users_common
 from devilry.devilry_cradmin import devilry_multiselect2
+from devilry.devilry_cradmin.devilry_listfilter.utils import WithResultValueRenderable
 from devilry.devilry_cradmin.viewhelpers import devilry_confirmview
 
 
@@ -25,7 +28,33 @@ class OverviewItemValue(listbuilder_relatedexaminer.OnPeriodItemValue):
     template_name = "devilry_admin/period/examiners/overview-itemvalue.django.html"
 
 
+class ExaminerUserListMatchResultRenderable(WithResultValueRenderable):
+    def get_object_name_singular(self, num_matches):
+        return gettext_lazy("examiner")
+
+    def get_object_name_plural(self, num_matches):
+        return gettext_lazy("examiners")
+
+
+class RowListWithMatchResults(RowList):
+    def append_results_renderable(self):
+        result_info_renderable = ExaminerUserListMatchResultRenderable(
+            value=None, num_matches=self.num_matches, num_total=self.num_total
+        )
+        self.renderable_list.insert(0, DefaultSpacingItemFrame(inneritem=result_info_renderable))
+
+    def __init__(self, num_matches, num_total, page):
+        self.num_matches = num_matches
+        self.num_total = num_total
+        self.page = page
+        super().__init__()
+
+        if page == 1:
+            self.append_results_renderable()
+
+
 class Overview(listbuilder_relatedexaminer.VerticalFilterListView):
+    listbuilder_class = RowListWithMatchResults
     value_renderer_class = OverviewItemValue
     template_name = "devilry_admin/period/examiners/overview.django.html"
 
@@ -39,9 +68,25 @@ class Overview(listbuilder_relatedexaminer.VerticalFilterListView):
     def get_filterlist_url(self, filters_string):
         return self.request.cradmin_app.reverse_appurl("filter", kwargs={"filters_string": filters_string})
 
+    def get_listbuilder_list_kwargs(self):
+        kwargs = super().get_listbuilder_list_kwargs()
+        kwargs["num_matches"] = self.num_matches or 0
+        kwargs["num_total"] = self.num_total or 0
+        kwargs["page"] = self.request.GET.get("page", 1)
+        return kwargs
+
+    def get_queryset_for_role(self, role):
+        queryset = super().get_queryset_for_role(role=role)
+
+        # Set filtered count on self.
+        self.num_matches = queryset.count()
+        return queryset
+
     def get_unfiltered_queryset_for_role(self, role):
         period = role
-        return self.model.objects.filter(period=period).select_related("user")
+        queryset = self.model.objects.filter(period=period).select_related("user")
+        self.num_total = queryset.count()
+        return queryset
 
     def __user_is_department_admin(self):
         requestuser_devilryrole = self.request.cradmin_instance.get_devilryrole_for_requestuser()

{devilry-6.5.2 → devilry-6.6.1}/devilry/devilry_admin/views/period/manage_tags/manage_tags.py

@@ -1,35 +1,34 @@
 # -*- coding: utf-8 -*-
 
 
-import re
-
+from cradmin_legacy import crapp
+from cradmin_legacy.crinstance import reverse_cradmin_url
+from cradmin_legacy.crispylayouts import PrimarySubmit
+from cradmin_legacy.viewhelpers import (
+    crudbase,
+    delete,
+    formbase,
+    listbuilderview,
+    multiselect2,
+    multiselect2view,
+    update,
+)
+from cradmin_legacy.viewhelpers.listbuilder import itemvalue
+from cradmin_legacy.viewhelpers.listbuilder.itemframe import DefaultSpacingItemFrame
+from cradmin_legacy.viewhelpers.listbuilder.lists import RowList
+from crispy_forms import layout
 from django import forms
-from django.db import models
 from django.contrib import messages
 from django.core.exceptions import ValidationError
-from django.db import transaction
-from django.http import Http404
-from django.http import HttpResponseRedirect
+from django.db import models, transaction
+from django.http import Http404, HttpResponseRedirect
 from django.utils import timezone
 from django.utils.translation import gettext_lazy, pgettext_lazy
-from django.views.generic import TemplateView
-from django.views.generic import View
-
-from crispy_forms import layout
+from django.views.generic import TemplateView, View
 
-from cradmin_legacy import crapp
-from cradmin_legacy.crinstance import reverse_cradmin_url
-from cradmin_legacy.crispylayouts import PrimarySubmit
-from cradmin_legacy.viewhelpers import formbase
-from cradmin_legacy.viewhelpers import update, delete, crudbase
-from cradmin_legacy.viewhelpers import listbuilderview
-from cradmin_legacy.viewhelpers.listbuilder import itemvalue
-from cradmin_legacy.viewhelpers import multiselect2view
-from cradmin_legacy.viewhelpers import multiselect2
-
-from devilry.apps.core.models import PeriodTag
-from devilry.apps.core.models import RelatedStudent, RelatedExaminer
-from devilry.devilry_admin.cradminextensions.listfilter import listfilter_tags, listfilter_relateduser
+from devilry.apps.core.models import PeriodTag, RelatedExaminer, RelatedStudent
+from devilry.devilry_admin.cradminextensions.listfilter import listfilter_relateduser, listfilter_tags
+from devilry.devilry_cradmin.devilry_listfilter.utils import WithResultValueRenderable
 
 
 class TagItemValue(itemvalue.EditDelete):
@@ -65,10 +64,34 @@ class HideShowPeriodTag(TemplateView):
         return period_tag
 
 
-class TagListBuilderListView(listbuilderview.FilterListMixin, listbuilderview.View):
-    """ """
+class TagListMatchResultRenderable(WithResultValueRenderable):
+    def get_object_name_singular(self, num_matches):
+        return gettext_lazy("tag")
 
+    def get_object_name_plural(self, num_matches):
+        return gettext_lazy("tags")
+
+
+class RowListWithMatchResults(RowList):
+    def append_results_renderable(self):
+        result_info_renderable = TagListMatchResultRenderable(
+            value=None, num_matches=self.num_matches, num_total=self.num_total
+        )
+        self.renderable_list.insert(0, DefaultSpacingItemFrame(inneritem=result_info_renderable))
+
+    def __init__(self, num_matches, num_total, page):
+        self.num_matches = num_matches
+        self.num_total = num_total
+        self.page = page
+        super().__init__()
+
+        if page == 1:
+            self.append_results_renderable()
+
+
+class TagListBuilderListView(listbuilderview.FilterListMixin, listbuilderview.View):
     template_name = "devilry_admin/period/manage_tags/manage-tags-list-view.django.html"
+    listbuilder_class = RowListWithMatchResults
     model = PeriodTag
     value_renderer_class = TagItemValue
     paginate_by = 10
@@ -84,6 +107,20 @@ class TagListBuilderListView(listbuilderview.FilterListMixin, listbuilderview.Vi
     def get_filterlist_url(self, filters_string):
         return self.request.cradmin_app.reverse_appurl("filter", kwargs={"filters_string": filters_string})
 
+    def get_listbuilder_list_kwargs(self):
+        kwargs = super().get_listbuilder_list_kwargs()
+        kwargs["num_matches"] = self.num_matches or 0
+        kwargs["num_total"] = self.num_total or 0
+        kwargs["page"] = self.request.GET.get("page", 1)
+        return kwargs
+
+    def get_queryset_for_role(self, role):
+        queryset = super().get_queryset_for_role(role=role)
+
+        # Set filtered count on self.
+        self.num_matches = queryset.count()
+        return queryset
+
     def get_unfiltered_queryset_for_role(self, role):
         queryset = (
             self.model.objects.filter(period=role)
@@ -100,6 +137,7 @@ class TagListBuilderListView(listbuilderview.FilterListMixin, listbuilderview.Vi
                 )
             )
         )
+        self.num_total = queryset.count()
         return queryset
 
     def get_no_items_message(self):

{devilry-6.5.2 → devilry-6.6.1}/devilry/devilry_admin/views/period/students.py

@@ -1,16 +1,19 @@
 from cradmin_legacy import crapp
 from cradmin_legacy.crispylayouts import DangerSubmit
+from cradmin_legacy.viewhelpers.listbuilder.itemframe import DefaultSpacingItemFrame
+from cradmin_legacy.viewhelpers.listbuilder.lists import RowList
 from django.contrib import messages
 from django.http import Http404
 from django.template.loader import render_to_string
 from django.utils.translation import gettext_lazy
 
-from devilry.apps.core.models import RelatedStudent, Assignment
+from devilry.apps.core.models import Assignment, RelatedStudent
 from devilry.devilry_account.models import PermissionGroup, User
 from devilry.devilry_admin.cradminextensions.listbuilder import listbuilder_relatedstudent
 from devilry.devilry_admin.cradminextensions.listfilter import listfilter_relateduser
 from devilry.devilry_admin.views.common import bulkimport_users_common
 from devilry.devilry_cradmin import devilry_multiselect2
+from devilry.devilry_cradmin.devilry_listfilter.utils import WithResultValueRenderable
 from devilry.devilry_cradmin.viewhelpers import devilry_confirmview
 
 
@@ -26,7 +29,33 @@ class OverviewItemValue(listbuilder_relatedstudent.ReadOnlyItemValue):
     template_name = "devilry_admin/period/students/overview-itemvalue.django.html"
 
 
+class StudentUserListMatchResultRenderable(WithResultValueRenderable):
+    def get_object_name_singular(self, num_matches):
+        return gettext_lazy("student")
+
+    def get_object_name_plural(self, num_matches):
+        return gettext_lazy("students")
+
+
+class RowListWithMatchResults(RowList):
+    def append_results_renderable(self):
+        result_info_renderable = StudentUserListMatchResultRenderable(
+            value=None, num_matches=self.num_matches, num_total=self.num_total
+        )
+        self.renderable_list.insert(0, DefaultSpacingItemFrame(inneritem=result_info_renderable))
+
+    def __init__(self, num_matches, num_total, page):
+        self.num_matches = num_matches
+        self.num_total = num_total
+        self.page = page
+        super().__init__()
+
+        if page == 1:
+            self.append_results_renderable()
+
+
 class Overview(listbuilder_relatedstudent.VerticalFilterListView):
+    listbuilder_class = RowListWithMatchResults
     value_renderer_class = OverviewItemValue
     template_name = "devilry_admin/period/students/overview.django.html"
 
@@ -40,14 +69,30 @@ class Overview(listbuilder_relatedstudent.VerticalFilterListView):
     def get_filterlist_url(self, filters_string):
         return self.request.cradmin_app.reverse_appurl("filter", kwargs={"filters_string": filters_string})
 
+    def get_listbuilder_list_kwargs(self):
+        kwargs = super().get_listbuilder_list_kwargs()
+        kwargs["num_matches"] = self.num_matches or 0
+        kwargs["num_total"] = self.num_total or 0
+        kwargs["page"] = self.request.GET.get("page", 1)
+        return kwargs
+
+    def get_queryset_for_role(self, role):
+        queryset = super().get_queryset_for_role(role=role)
+
+        # Set filtered count on self.
+        self.num_matches = queryset.count()
+        return queryset
+
     def get_unfiltered_queryset_for_role(self, role):
         period = role
-        return (
+        queryset = (
             self.model.objects.filter(period=period)
             .prefetch_syncsystemtag_objects()
             .select_related("user")
             .order_by("user__shortname")
         )
+        self.num_total = queryset.count()
+        return queryset
 
     def __user_is_department_admin(self):
         requestuser_devilryrole = self.request.cradmin_instance.get_devilryrole_for_requestuser()

devilry-6.6.1/devilry/devilry_dataporten_allauth/callback.py

@@ -0,0 +1,5 @@
+from allauth.socialaccount.providers.oauth2.views import OAuth2CallbackView
+
+
+class DevilryOAuth2CallbackView(OAuth2CallbackView):
+    pass

{devilry-6.5.2 → devilry-6.6.1}/devilry/devilry_markup/markdown_extensions/code_diff.py

@@ -2,9 +2,10 @@ import difflib
 import re
 import typing
 import uuid
+
 from django.template.loader import render_to_string
-from markdown.preprocessors import Preprocessor
 from markdown import Extension
+from markdown.preprocessors import Preprocessor
 
 
 class CodeDiffPreprocessor(Preprocessor):
@@ -110,6 +111,5 @@ class CodeDiffPreprocessor(Preprocessor):
 
 
 class CodeDiffExtension(Extension):
-    def extendMarkdown(self, md, md_globals):
-        # md.registerExtension(self)
+    def extendMarkdown(self, md):
         md.preprocessors.register(CodeDiffPreprocessor(md), "codediff", 25)