From 918f00f9a2a0f049f6582083c68e2cef1ce868e9 Mon Sep 17 00:00:00 2001 From: Johannes Löthberg Date: Sat, 20 Jun 2015 12:44:38 +0200 Subject: Let co-maintainers edit package keywords MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Johannes Löthberg Signed-off-by: Lukas Fleischer --- web/lib/pkgbasefuncs.inc.php | 3 ++- web/template/pkg_details.php | 4 ++-- 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"]); 0): +if (has_credential(CRED_PKGBASE_SET_KEYWORDS, $maintainers) || count($keywords) > 0): ?>
-- cgit v1.2.3-24-g4f1b