On Tue, 06 Feb 2018 at 03:54:56, Mark Weiman wrote: > Implements FS#53832 > > Signed-off-by: Mark Weiman <[email protected]> > --- > web/html/pkgbase.php | 3 +++ > web/html/pkgdisown.php | 13 ++++++++++--- > web/lib/pkgbasefuncs.inc.php | 12 ++++++++++-- > web/template/pkgbase_actions.php | 2 +- > 4 files changed, 24 insertions(+), 6 deletions(-) > > [...] > @@ -23,7 +26,11 @@ if (has_credential(CRED_PKGBASE_DISOWN, > $maintainer_uids)): ?> > <?php endforeach; ?> > </ul> > <p> > - <?php if (count($comaintainers) > 0 && > !has_credential(CRED_PKGBASE_DISOWN)): ?> > + > + <?php if (in_array(uid_from_sid($_COOKIE["AURSID"]), > $comaintainer_uids) && !has_credential(CRED_PKGBASE_DISOWN)): > + $action = "do_DisownComaintainer"; ?> > + <?= __("By selecting the checkbox, you confirm that > you want to no longer be a package co-maintainer.") ?> > + <?php elseif (count($comaintainers) > 0 && > !has_credential(CRED_PKGBASE_DISOWN)): ?>
I am not sure whether it is a good idea to use the same button for disowning a package as a maintainer or as a co-maintainer? What happens if a user is both a maintainer and a co-maintainer (and what is the expected behavior)? Anyway, merged this into pu as-is for now; we can still replace it later. Regards, Lukas
