diff options
| author | Lukas Fleischer <archlinux@cryptocrack.de> | 2014-06-25 11:29:17 +0200 |
|---|---|---|
| committer | Lukas Fleischer <archlinux@cryptocrack.de> | 2014-06-25 11:38:02 +0200 |
| commit | 91e6b5cb2f3d531ce40cd0331e2261d30766de47 (patch) | |
| tree | 1b901e6000b44569123a51fd2dd2aa371d92f443 /web/template/pkgreq_results.php | |
| parent | 959c61a77dd6a41bf82cc12b5eb873c9cfb0ffb8 (diff) | |
| download | aur-91e6b5cb2f3d531ce40cd0331e2261d30766de47.tar.gz aur-91e6b5cb2f3d531ce40cd0331e2261d30766de47.tar.xz | |
Add support for merge requests
This adds a new "Merge" category to the list of available request types
and also adds a new "Merge into" field that is hidden via JavaScript
when "Deletion" or "Orphan" is selected.
Signed-off-by: Lukas Fleischer <archlinux@cryptocrack.de>
Diffstat (limited to 'web/template/pkgreq_results.php')
| -rw-r--r-- | web/template/pkgreq_results.php | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/web/template/pkgreq_results.php b/web/template/pkgreq_results.php index 8ab8351f..042cc3af 100644 --- a/web/template/pkgreq_results.php +++ b/web/template/pkgreq_results.php @@ -36,7 +36,11 @@ <?php else: ?> <td><?= htmlspecialchars($row["Name"]) ?></td> <?php endif; ?> + <?php if ($row['Type'] == 'merge'): ?> + <td><?= htmlspecialchars(ucfirst($row['Type']), ENT_QUOTES); ?> (<?= htmlspecialchars(ucfirst($row['MergeInto']), ENT_QUOTES); ?>)</td> + <?php else: ?> <td><?= htmlspecialchars(ucfirst($row['Type']), ENT_QUOTES); ?></td> + <?php endif; ?> <td class="wrap"><?= htmlspecialchars($row['Comments'], ENT_QUOTES); ?></td> <td> <a href="<?= get_uri('/account/') . htmlspecialchars($row['User'], ENT_QUOTES) ?>" title="<?= __('View account information for %s', htmlspecialchars($row['User'])) ?>"><?= htmlspecialchars($row['User']) ?></a> @@ -47,6 +51,8 @@ <?php if ($row['BaseID']): ?> <?php if ($row['Type'] == 'deletion'): ?> <a href="<?= get_pkgbase_uri($row['Name']) ?>delete/?via=<?= intval($row['ID']) ?>"><?= __('Accept') ?></a> + <?php elseif ($row['Type'] == 'merge'): ?> + <a href="<?= get_pkgbase_uri($row['Name']) ?>merge/?into=<?= urlencode($row['MergeInto']) ?>&via=<?= intval($row['ID']) ?>"><?= __('Accept') ?></a> <?php elseif ($row['Type'] == 'orphan'): ?> <form action="<?= get_pkgbase_uri($row['Name']) . 'disown/'; ?>" method="post"> <input type="hidden" name="token" value="<?= htmlspecialchars($_COOKIE['AURSID']) ?>" /> |