Skip to content
Snippets Groups Projects
Verified Commit d393ed23 authored by Jelle van der Waa's avatar Jelle van der Waa :construction:
Browse files

fix(templates): hide non-actionable links when not logged in 

A non-logged in user cannot vote/enable notifications or submit a
request so hide these links.
parent a16fac9b
No related branches found
No related tags found
1 merge request!816fix(templates): hide non-actionable links when not logged in
Hide whitespace changes
Inline Side-by-side
templates/partials/packages/actions.html
+ 69
− 65
View file @ d393ed23
......@@ -24,71 +24,73 @@
{{ "Search wiki" | tr }}
</a>
</li>
{% if not out_of_date %}
{% if request.user.is_authenticated() %}
{% if not out_of_date %}
<li>
<a href="/pkgbase/{{ pkgbase.Name }}/flag">
{{ "Flag package out-of-date" | tr }}
</a>
</li>
{% else %}
<li>
<span class="flagged">
<a href="/pkgbase/{{ pkgbase.Name }}/flag-comment">
{{
"Flagged out-of-date (%s)"
| tr | format(date_strftime(pkgbase.OutOfDateTS, "%Y-%m-%d"))
}}
</a>
</span>
</li>
{% if request.user.has_credential(creds.PKGBASE_UNFLAG, approved=unflaggers) %}
<li>
<form action="/pkgbase/{{ pkgbase.Name }}/unflag" method="post">
<input class="button text-button"
type="submit"
name="do_UnFlag"
value="{{ 'Unflag package' | tr }}"
/>
</form>
</li>
{% endif %}
{% endif %}
<li>
<a href="/pkgbase/{{ pkgbase.Name }}/flag">
{{ "Flag package out-of-date" | tr }}
</a>
</li>
{% else %}
<li>
<span class="flagged">
<a href="/pkgbase/{{ pkgbase.Name }}/flag-comment">
{{
"Flagged out-of-date (%s)"
| tr | format(date_strftime(pkgbase.OutOfDateTS, "%Y-%m-%d"))
}}
</a>
</span>
</li>
{% if request.user.has_credential(creds.PKGBASE_UNFLAG, approved=unflaggers) %}
<li>
<form action="/pkgbase/{{ pkgbase.Name }}/unflag" method="post">
<input class="button text-button"
type="submit"
name="do_UnFlag"
value="{{ 'Unflag package' | tr }}"
/>
</form>
</li>
{% endif %}
{% endif %}
<li>
{% if not voted %}
<form action="/pkgbase/{{ pkgbase.Name }}/vote" method="post">
<input type="submit"
class="button text-button"
name="do_Vote"
value="{{ 'Vote for this package' | tr }}" />
</form>
{% else %}
<form action="/pkgbase/{{ pkgbase.Name }}/unvote" method="post">
<input type="submit"
class="button text-button"
name="do_UnVote"
value="{{ 'Remove vote' | tr }}" />
</form>
{% endif %}
</li>
<li>
{% if notified %}
<form action="/pkgbase/{{ pkgbase.Name }}/unnotify" method="post">
{% if not voted %}
<form action="/pkgbase/{{ pkgbase.Name }}/vote" method="post">
<input type="submit"
class="button text-button"
name="do_UnNotify"
value="{{ 'Disable notifications' | tr }}"
/>
name="do_Vote"
value="{{ 'Vote for this package' | tr }}" />
</form>
{% else %}
<form action="/pkgbase/{{ pkgbase.Name }}/notify" method="post">
<input type="submit"
class="button text-button"
name="do_Notify"
value="{{ 'Enable notifications' | tr }}"
/>
{% else %}
<form action="/pkgbase/{{ pkgbase.Name }}/unvote" method="post">
<input type="submit"
class="button text-button"
name="do_UnVote"
value="{{ 'Remove vote' | tr }}" />
</form>
{% endif %}
</li>
{% endif %}
</li>
<li>
{% if notified %}
<form action="/pkgbase/{{ pkgbase.Name }}/unnotify" method="post">
<input type="submit"
class="button text-button"
name="do_UnNotify"
value="{{ 'Disable notifications' | tr }}"
/>
</form>
{% else %}
<form action="/pkgbase/{{ pkgbase.Name }}/notify" method="post">
<input type="submit"
class="button text-button"
name="do_Notify"
value="{{ 'Enable notifications' | tr }}"
/>
</form>
{% endif %}
</li>
{% endif %}
{% if request.user.has_credential(creds.PKGBASE_EDIT_COMAINTAINERS, approved=[pkgbase.Maintainer]) %}
<li>
<a href="/pkgbase/{{ pkgbase.Name }}/comaintainers">
......@@ -111,11 +113,13 @@
</li>
{% endif %}
{% endif %}
<li>
<a href="/pkgbase/{{ pkgbase.Name }}/request?{{ {'next': '/pkgbase/%s' | format(pkgbase.Name)} | urlencode }}">
{{ "Submit Request" | tr }}
</a>
</li>
{% if request.user.is_authenticated() %}
<li>
<a href="/pkgbase/{{ pkgbase.Name }}/request?{{ {'next': '/pkgbase/%s' | format(pkgbase.Name)} | urlencode }}">
{{ "Submit Request" | tr }}
</a>
</li>
{% endif %}
{% if request.user.has_credential(creds.PKGBASE_DELETE) %}
<li>
<a href="/pkgbase/{{ pkgbase.Name }}/delete?next=/packages">
......
test/test_packages_routes.py
+ 3
− 0
View file @ d393ed23
......@@ -507,7 +507,9 @@ def test_package_requests_display(
client: TestClient, user: User, package: Package, pkgreq: PackageRequest
):
# Test that a single request displays "1 pending request".
cookies = {"AURSID": user.login(Request(), "testPassword")}
with client as request:
request.cookies = cookies
resp = request.get(package_endpoint(package))
assert resp.status_code == int(HTTPStatus.OK)
......@@ -530,6 +532,7 @@ def test_package_requests_display(
# Test that a two requests display "2 pending requests".
with client as request:
request.cookies = cookies
resp = request.get(package_endpoint(package))
assert resp.status_code == int(HTTPStatus.OK)
......
  • Lex Black @trialnerror ·

    One sideeffect of this change is, that one isn't able to see if a package is out of date or has a pending request if not logged in. And this seems kinda inconsequent, as out of date is still shown in the package list. But going to the details page this is omitted? On a personal note: Not logged into my AUR account, but being able to see if something has requests or is out of date was helpful when looking at orphans and such.

  • Christian Heusel :rocket: @gromit ·
    Reporter

    @trialnerror please don't comment on a commit (because there is a good chance no one will ever see it), rather open a new issue or comment on the original merge request where the change was introduced.

  • Lex Black @trialnerror ·

    @gromit Valid point. Wasn't sure about issues, but I missed the MR.
    But doesn't make a difference, as I noticed that my comment also appears in the original MR. Gitlab seems to be able to track that

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