summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohannes Löthberg <johannes@kyriasis.com>2015-06-20 12:44:38 +0200
committerLukas Fleischer <lfleischer@archlinux.org>2015-06-20 14:27:00 +0200
commit918f00f9a2a0f049f6582083c68e2cef1ce868e9 (patch)
tree7d1ee1a90e95794b956b5cea515c54f294b4ec7b
parenta5fd2bb39d8bb655ffcc05decec0bdba3eda7e75 (diff)
downloadaur-918f00f9a2a0f049f6582083c68e2cef1ce868e9.tar.gz
aur-918f00f9a2a0f049f6582083c68e2cef1ce868e9.tar.xz
Let co-maintainers edit package keywords
Signed-off-by: Johannes Löthberg <johannes@kyriasis.com> Signed-off-by: Lukas Fleischer <lfleischer@archlinux.org>
-rw-r--r--web/lib/pkgbasefuncs.inc.php3
-rw-r--r--web/template/pkg_details.php4
2 files changed, 4 insertions, 3 deletions
diff --git a/web/lib/pkgbasefuncs.inc.php b/web/lib/pkgbasefuncs.inc.php
index d9185e7a..92202bf8 100644
--- a/web/lib/pkgbasefuncs.inc.php
+++ b/web/lib/pkgbasefuncs.inc.php
@@ -957,7 +957,8 @@ function pkgbase_get_keywords($base_id) {
function pkgbase_set_keywords($base_id, $keywords) {
$base_id = intval($base_id);
- if (!has_credential(CRED_PKGBASE_SET_KEYWORDS, array(pkgbase_maintainer_uid($base_id)))) {
+ $maintainers = array_merge(array(pkgbase_maintainer_uid($base_id)), pkgbase_get_comaintainer_uids(array($base_id)));
+ if (!has_credential(CRED_PKGBASE_SET_KEYWORDS, $maintainers)) {
return array(false, __("You are not allowed to edit the keywords of this package base."));
}
diff --git a/web/template/pkg_details.php b/web/template/pkg_details.php
index fb81442d..9a360e3c 100644
--- a/web/template/pkg_details.php
+++ b/web/template/pkg_details.php
@@ -196,13 +196,13 @@ $sources = pkg_sources($row["ID"]);
<td><a href="<?= htmlspecialchars($row['URL'], ENT_QUOTES) ?>" title="<?= __('Visit the website for') . ' ' . htmlspecialchars( $row['Name'])?>"><?= htmlspecialchars($row['URL'], ENT_QUOTES) ?></a></td>
</tr>
<?php
-if (has_credential(CRED_PKGBASE_SET_KEYWORDS, array($row["MaintainerUID"])) || count($keywords) > 0):
+if (has_credential(CRED_PKGBASE_SET_KEYWORDS, $maintainers) || count($keywords) > 0):
?>
<tr>
<th><?= __('Keywords') . ': ' ?></th>
<td>
<?php
-if (has_credential(CRED_PKGBASE_SET_KEYWORDS, array($row["MaintainerUID"]))):
+if (has_credential(CRED_PKGBASE_SET_KEYWORDS, $maintainers)):
?>
<form method="post" action="<?= htmlspecialchars(get_pkgbase_uri($row['BaseName']), ENT_QUOTES); ?>">
<div>