diff --git a/aurweb/routers/packages.py b/aurweb/routers/packages.py index 6a943dbf..837f9753 100644 --- a/aurweb/routers/packages.py +++ b/aurweb/routers/packages.py @@ -102,6 +102,7 @@ async def packages_get( models.PackageBase.Popularity, models.PackageBase.NumVotes, models.PackageBase.OutOfDateTS, + models.PackageBase.ModifiedTS, models.User.Username.label("Maintainer"), models.PackageVote.PackageBaseID.label("Voted"), models.PackageNotification.PackageBaseID.label("Notify"), diff --git a/templates/partials/packages/search_results.html b/templates/partials/packages/search_results.html index 84c39079..a365a1d3 100644 --- a/templates/partials/packages/search_results.html +++ b/templates/partials/packages/search_results.html @@ -68,6 +68,16 @@ {{ "Maintainer" | tr }} + + {% if SB == "l" %} + {% set order = reverse_order %} + {% else %} + {% set order = SO %} + {% endif %} + + {{ "Last Updated" | tr }} + + @@ -115,6 +125,11 @@ {{ "orphan" | tr }} {% endif %} + {% if flagged %} + {{ datetime_display(pkg.ModifiedTS) }} + {% else %} + {{ datetime_display(pkg.ModifiedTS) }} + {% endif %} {% endfor %} diff --git a/test/test_packages_routes.py b/test/test_packages_routes.py index f9cea694..f21358f8 100644 --- a/test/test_packages_routes.py +++ b/test/test_packages_routes.py @@ -5,7 +5,8 @@ from unittest import mock import pytest from fastapi.testclient import TestClient -from aurweb import asgi, db, time +from aurweb import asgi, config, db, time +from aurweb.filters import datetime_display from aurweb.models import License, PackageLicense from aurweb.models.account_type import USER_ID, AccountType from aurweb.models.dependency_type import DependencyType @@ -1085,6 +1086,11 @@ def test_packages_sort_by_last_modified(client: TestClient, packages: list[Packa col = row.xpath("./td")[0].xpath("./a")[0] assert col.text.strip() == package.Name + # Make sure our row contains the modified date we've set + tz = config.get("options", "default_timezone") + dt = datetime_display({"timezone": tz}, package.PackageBase.ModifiedTS) + assert dt in "".join(row.itertext()) + def test_packages_flagged( client: TestClient, maintainer: User, packages: list[Package]