diff options
| author | Lukas Fleischer <lfleischer@archlinux.org> | 2015-08-30 16:32:34 +0200 |
|---|---|---|
| committer | Lukas Fleischer <lfleischer@archlinux.org> | 2015-08-30 16:51:14 +0200 |
| commit | 57db4814a47d2a40d4b74e3ae0df261bbfeb45b8 (patch) | |
| tree | 0b79b818d11046864cf6a0dc5f8864bcc8962e5f /web/template | |
| parent | e1a258bd832c3ba76b5f898cbd068c5bdf4eb4dc (diff) | |
| download | aurweb-57db4814a47d2a40d4b74e3ae0df261bbfeb45b8.tar.xz | |
Allow users to unflag packages they flagged themselves
Sometimes, a user accidentally flags a package out-of-date. Allow users
to unflag packages that they flagged themselves, thereby providing a way
to undo these actions.
Implements FS#46145.
Signed-off-by: Lukas Fleischer <lfleischer@archlinux.org>
Diffstat (limited to 'web/template')
| -rw-r--r-- | web/template/pkg_details.php | 3 | ||||
| -rw-r--r-- | web/template/pkgbase_actions.php | 2 | ||||
| -rw-r--r-- | web/template/pkgbase_details.php | 3 |
3 files changed, 5 insertions, 3 deletions
diff --git a/web/template/pkg_details.php b/web/template/pkg_details.php index f4eed51..5ba3607 100644 --- a/web/template/pkg_details.php +++ b/web/template/pkg_details.php @@ -21,8 +21,9 @@ $packager = username_from_id($row["PackagerUID"]); if ($row["MaintainerUID"] !== NULL) { $maintainers = array_merge(array($row["MaintainerUID"]), pkgbase_get_comaintainer_uids(array($base_id))); } else { - $maintainers = NULL; + $maintainers = array(); } +$unflaggers = array_merge($maintainers, array($row["FlaggerUID"])); $votes = $row['NumVotes']; $popularity = $row['Popularity']; diff --git a/web/template/pkgbase_actions.php b/web/template/pkgbase_actions.php index c7428ee..dea348e 100644 --- a/web/template/pkgbase_actions.php +++ b/web/template/pkgbase_actions.php @@ -11,7 +11,7 @@ <li><span class="flagged"><?php if ($row["OutOfDateTS"] !== NULL) { echo __('Flagged out-of-date')." (${out_of_date_time})"; } ?></span></li> <?php if ($row["OutOfDateTS"] === NULL): ?> <li><?= html_action_form($base_uri . 'flag/', "do_Flag", __('Flag package out-of-date')) ?></li> - <?php elseif (($row["OutOfDateTS"] !== NULL) && has_credential(CRED_PKGBASE_UNFLAG, $maintainers)): ?> + <?php elseif (($row["OutOfDateTS"] !== NULL) && has_credential(CRED_PKGBASE_UNFLAG, $unflaggers)): ?> <li><?= html_action_form($base_uri . 'unflag/', "do_UnFlag", __('Unflag package')) ?></li> <?php endif; ?> diff --git a/web/template/pkgbase_details.php b/web/template/pkgbase_details.php index d4304e3..1012c4e 100644 --- a/web/template/pkgbase_details.php +++ b/web/template/pkgbase_details.php @@ -20,8 +20,9 @@ $packager = username_from_id($row["PackagerUID"]); if ($row["MaintainerUID"] !== NULL) { $maintainers = array_merge(array($row["MaintainerUID"]), pkgbase_get_comaintainer_uids(array($base_id))); } else { - $maintainers = NULL; + $maintainers = array(); } +$unflaggers = array_merge($maintainers, array($row["FlaggerUID"])); $votes = $row['NumVotes']; $popularity = $row['Popularity']; |