fix: correct redirects for package actions & requests

For requests, we always pass a `next` of /requests, leading us
back to the requests page. For a standard package, we get redirected
to the involved pkgbase, or target pkgbase if a merge action was taken.

Signed-off-by: Kevin Morris <kevr@0cost.org>
This commit is contained in:
Kevin Morris 2022-02-08 22:55:43 -08:00
parent c883c71053
commit 3f95ac7db3
No known key found for this signature in database
GPG key ID: F7E46DED420788F3
5 changed files with 28 additions and 12 deletions

View file

@ -102,13 +102,13 @@
</li>
{% endif %}
<li>
<a href="/pkgbase/{{ pkgbase.Name }}/request">
<a href="/pkgbase/{{ pkgbase.Name }}/request?{{ {'next': '/pkgbase/%s' | format(pkgbase.Name)} | urlencode }}">
{{ "Submit Request" | tr }}
</a>
</li>
{% if request.user.has_credential(creds.PKGBASE_DELETE) %}
<li>
<a href="/pkgbase/{{ pkgbase.Name }}/delete">
<a href="/pkgbase/{{ pkgbase.Name }}/delete?next=/packages">
{{ "Delete Package" | tr }}
</a>
</li>
@ -131,7 +131,7 @@
</li>
{% elif request.user.has_credential(creds.PKGBASE_DISOWN, approved=[pkgbase.Maintainer]) %}
<li>
<a href="/pkgbase/{{ pkgbase.Name }}/disown">
<a href="/pkgbase/{{ pkgbase.Name }}/disown?{{ {'next': '/pkgbase/%s' | format(pkgbase.Name)} | urlencode }}">
{{ "Disown Package" | tr }}
</a>
</li>

View file

@ -45,6 +45,7 @@
<form action="/pkgbase/{{ pkgbase.Name }}/delete" method="post">
<fieldset>
<input type="hidden" name="next" value="{{ next }}" />
<p>
<label for="id_comments">{{ "Comments" | tr }}:</label>

View file

@ -45,6 +45,8 @@
<form action="/pkgbase/{{ pkgbase.Name }}/disown" method="post">
<fieldset>
<input type="hidden" name="next" value="{{ next }}" />
<p>
<label for="id_comments">{{ "Comments" | tr }}:</label>
<textarea id="id_comments"

View file

@ -27,6 +27,8 @@
<form id="request-form" action="/pkgbase/{{ pkgbase.Name }}/request"
method="post">
<fieldset>
<input type="hidden" name="next" value="{{ next }}" />
<p>
<label for="id_type">{{ "Request type" | tr }}:</label>
<select id="id_type" name="type">