diff --git a/aurweb/models/package_source.py b/aurweb/models/package_source.py index 59046bbd..4ea1645b 100644 --- a/aurweb/models/package_source.py +++ b/aurweb/models/package_source.py @@ -10,7 +10,10 @@ class PackageSource(Base): __table__ = schema.PackageSources __tablename__ = __table__.name __mapper_args__ = { - "primary_key": [__table__.c.PackageID] + "primary_key": [ + __table__.c.PackageID, + __table__.c.Source + ] } Package = relationship( @@ -26,3 +29,6 @@ class PackageSource(Base): statement="Foreign key PackageID cannot be null.", orig="PackageSources.PackageID", params=("NULL")) + + if not self.Source: + self.Source = "/dev/null" diff --git a/aurweb/routers/packages.py b/aurweb/routers/packages.py index fc292610..382a096a 100644 --- a/aurweb/routers/packages.py +++ b/aurweb/routers/packages.py @@ -201,7 +201,8 @@ async def package(request: Request, name: str) -> Response: context["package"] = pkg # Package sources. - context["sources"] = pkg.package_sources + context["sources"] = pkg.package_sources.order_by( + models.PackageSource.Source.asc()).all() # Package dependencies. dependencies = db.query(models.PackageDependency).join( diff --git a/templates/partials/packages/package_metadata.html b/templates/partials/packages/package_metadata.html index e7b1aefb..9f5c8854 100644 --- a/templates/partials/packages/package_metadata.html +++ b/templates/partials/packages/package_metadata.html @@ -45,14 +45,14 @@
-

Sources ({{ sources.count() }})

+

Sources ({{ sources | length }})