Verified Commit 62388b41 authored by Kevin Morris's avatar Kevin Morris
Browse files

fix(package/pkgbase view): include comaintainers in Maintainer field



Signed-off-by: Kevin Morris's avatarKevin Morris <kevr@0cost.org>
parent 2c4f4155
......@@ -25,6 +25,9 @@ def make_context(request: Request, pkgbase: PackageBase) -> Dict[str, Any]:
context["git_clone_uri_anon"] = config.get("options", "git_clone_uri_anon")
context["git_clone_uri_priv"] = config.get("options", "git_clone_uri_priv")
context["pkgbase"] = pkgbase
context["comaintainers"] = pkgbase.comaintainers.order_by(
PackageComaintainer.Priority.asc()
).all()
context["packages_count"] = pkgbase.packages.count()
context["keywords"] = pkgbase.keywords
context["comments"] = pkgbase.comments.order_by(
......
......@@ -105,13 +105,16 @@
{% endif %}
</td>
</tr>
<tr>
<tr class="pkgmaint">
<th>{{ "Maintainer" | tr }}:</th>
<td>
{% if pkgbase.Maintainer %}
<a href="/account/{{ pkgbase.Maintainer.Username }}">
{{ pkgbase.Maintainer.Username }}
</a>
{% if comaintainers %}
({% for co in comaintainers %}<a href="{{ co.User | account_url }}">{{ co.User }}</a>{% endfor %})
{% endif %}
{% else %}
{{ pkgbase.Maintainer.Username | default("None" | tr) }}
{% endif %}
......
......@@ -253,6 +253,31 @@ def test_pkgbase(client: TestClient, package: Package):
assert pkgs[i].text.strip() == name
def test_pkgbase_maintainer(client: TestClient, user: User, maintainer: User,
package: Package):
"""
Test that the Maintainer field is beind displayed correctly.
Co-maintainers are displayed, if they exist, within a parens after
the maintainer.
"""
with db.begin():
db.create(PackageComaintainer, User=user,
PackageBase=package.PackageBase,
Priority=1)
with client as request:
resp = request.get(f"/pkgbase/{package.Name}")
assert resp.status_code == int(HTTPStatus.OK)
root = parse_root(resp.text)
maint = root.xpath('//table[@id="pkginfo"]/tr[@class="pkgmaint"]/td')[0]
maint, comaint = maint.xpath('./a')
assert maint.text.strip() == maintainer.Username
assert comaint.text.strip() == user.Username
def test_pkgbase_voters(client: TestClient, tu_user: User, package: Package):
pkgbase = package.PackageBase
endpoint = f"/pkgbase/{pkgbase.Name}/voters"
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment