| Message ID | 20180510211705.12666-1-eschwartz@archlinux.org |
|---|---|
| State | Accepted, archived |
| Headers | show |
On Thu, 10 May 2018 at 23:17:05, Eli Schwartz wrote: > This forwards to a confirmation page, and currently drops the "via" > parameter in the process. > > As a result, accepted orphan requests usually show: > > Request #XXXXXX has been accepted automatically by the Arch User > Repository package request system: > > The user YYYYYYY disowned the package. > > This is wrong, and should show (will show, if you manually add it or use > the close button instead of the accept button): > > Request #XXXXXX has been rejected by YYYYYYY [1]: > > Fixes FS#56606 > > Signed-off-by: Eli Schwartz <eschwartz@archlinux.org> > --- > web/template/pkgreq_results.php | 6 +----- > 1 file changed, 1 insertion(+), 5 deletions(-) > [...] Merged, thanks!
diff --git a/web/template/pkgreq_results.php b/web/template/pkgreq_results.php index fb49dfa..3c824c0 100644 --- a/web/template/pkgreq_results.php +++ b/web/template/pkgreq_results.php @@ -82,11 +82,7 @@ <a href="<?= get_pkgbase_uri($row['Name']) ?>merge/?into=<?= urlencode($row['MergeInto']) ?>&via=<?= intval($row['ID']) ?>"><?= __('Accept') ?></a> <br /> <?php elseif ($row['Type'] == 'orphan' && $due): ?> - <form action="<?= get_pkgbase_uri($row['Name']) . 'disown/'; ?>" method="post"> - <input type="hidden" name="token" value="<?= htmlspecialchars($_COOKIE['AURSID']) ?>" /> - <input type="hidden" name="via" value="<?= intval($row['ID']) ?>" /> - <input type="submit" class="button text-button" name="do_Disown" value="<?= __('Accept') ?>" /> - </form> + <a href="<?= get_pkgbase_uri($row['Name']) ?>disown/?via=<?= intval($row['ID']) ?>"><?= __('Accept') ?></a> <?php elseif ($row['Type'] == 'orphan' && !$due): ?> <?= __('Locked') ?> (<?= $time_left_fmt ?>) <br />
This forwards to a confirmation page, and currently drops the "via" parameter in the process. As a result, accepted orphan requests usually show: Request #XXXXXX has been accepted automatically by the Arch User Repository package request system: The user YYYYYYY disowned the package. This is wrong, and should show (will show, if you manually add it or use the close button instead of the accept button): Request #XXXXXX has been rejected by YYYYYYY [1]: Fixes FS#56606 Signed-off-by: Eli Schwartz <eschwartz@archlinux.org> --- web/template/pkgreq_results.php | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-)