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

Allow to search for both maintainer and co-maintainer

Browse source 
As a follow-up to commit 6cb8c04 (Implement co-maintainer search,
2017-01-26), add an option to search for both maintainers and
co-maintainers at the same time.

Signed-off-by: Lukas Fleischer <lfleischer@archlinux.org>
This commit is contained in:
Lukas Fleischer 2017-02-07 08:16:08 +01:00
parent 1613bd2f29
commit 880d25e98c
2 changed files with 9 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
web/lib/pkgfuncs.inc.php
View file

@ -717,6 +717,14 @@ function pkg_search_page($params, $show_headers=true, $SID="") {
$q_where .= "WHERE PackageComaintainers.PackageBaseID = PackageBases.ID "; $q_where .= "WHERE PackageComaintainers.PackageBaseID = PackageBases.ID ";
$q_where .= "AND Users.Username = " . $dbh->quote($params['K']) . ")"; $q_where .= "AND Users.Username = " . $dbh->quote($params['K']) . ")";
} }
elseif (isset($params["SeB"]) && $params["SeB"] == "M") {
/* Search by maintainer and co-maintainer. */
$q_where .= "AND (Users.Username = " . $dbh->quote($params['K']) . " ";
$q_where .= "OR EXISTS (SELECT * FROM PackageComaintainers ";
$q_where .= "INNER JOIN Users ON Users.ID = PackageComaintainers.UsersID ";
$q_where .= "WHERE PackageComaintainers.PackageBaseID = PackageBases.ID ";
$q_where .= "AND Users.Username = " . $dbh->quote($params['K']) . "))";
}
elseif (isset($params["SeB"]) && $params["SeB"] == "s") { elseif (isset($params["SeB"]) && $params["SeB"] == "s") {
/* Search by submitter. */ /* Search by submitter. */
$q_where .= "AND SubmitterUID = " . intval(uid_from_username($params['K'])) . " "; $q_where .= "AND SubmitterUID = " . intval(uid_from_username($params['K'])) . " ";

1
web/template/pkg_search_form.php
View file

@ -10,6 +10,7 @@ $searchby = array(
'k' => __('Keywords'), 'k' => __('Keywords'),
'm' => __('Maintainer'), 'm' => __('Maintainer'),
'c' => __('Co-maintainer'), 'c' => __('Co-maintainer'),
'M' => __('Maintainer, Co-maintainer'),
's' => __('Submitter') 's' => __('Submitter')
); );