external/aurweb
0
0
Fork 0
mirror of https://gitlab.archlinux.org/archlinux/aurweb.git synced 2025-02-03 10:43:03 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Filter out current username from co-maintainers list.

Browse source 
Closes: #8

Signed-off-by: Leonidas Spyropoulos <artafinde@gmail.com>
Signed-off-by: Eli Schwartz <eschwartz@archlinux.org>
This commit is contained in:
Leonidas Spyropoulos 2021-04-07 09:56:16 +01:00 • committed by Kevin Morris
parent cd3e880264
commit 21140e28a8
1 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
web/lib/pkgbasefuncs.inc.php
View file

@ -1189,7 +1189,8 @@ function pkgbase_get_comaintainer_uids($base_ids) {
* @return array Tuple of success/failure indicator and error message * @return array Tuple of success/failure indicator and error message
*/ */
function pkgbase_set_comaintainers($base_id, $users, $override=false) { function pkgbase_set_comaintainers($base_id, $users, $override=false) {
if (!$override && !has_credential(CRED_PKGBASE_EDIT_COMAINTAINERS, array(pkgbase_maintainer_uid($base_id)))) { $maintainer_uid = pkgbase_maintainer_uid($base_id);
if (!$override && !has_credential(CRED_PKGBASE_EDIT_COMAINTAINERS, array($maintainer_uid))) {
return array(false, __("You are not allowed to manage co-maintainers of this package base.")); return array(false, __("You are not allowed to manage co-maintainers of this package base."));
} }
@ -1207,9 +1208,12 @@ function pkgbase_set_comaintainers($base_id, $users, $override=false) {
if (!$uid) { if (!$uid) {
return array(false, __("Invalid user name: %s", $user)); return array(false, __("Invalid user name: %s", $user));
} elseif ($uid == $maintainer_uid) {
// silently ignore when maintainer == co-maintainer
continue;
} else {
$uids_new[] = $uid;
} }
$uids_new[] = $uid;
} }
$q = sprintf("SELECT UsersID FROM PackageComaintainers WHERE PackageBaseID = %d", $base_id); $q = sprintf("SELECT UsersID FROM PackageComaintainers WHERE PackageBaseID = %d", $base_id);