oqapi/webgui
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Drop the requirement for checking the status of users to be listed when no status check has been asked for.

Browse source
This commit is contained in:
Colin Kuskie 2011-12-28 18:23:10 -08:00
parent e65989b114
commit 5bbfe27f35
1 changed files with 3 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

8
lib/WebGUI/Operation/User.pm
View file

@ -211,11 +211,9 @@ sub doUserSearch {
my $returnPaginator = shift;
my $userFilter = shift;
push(@{$userFilter},0);
my $selectedStatus;
my $selectedStatus = '';
if ($session->scratch->get("userSearchStatus")) {
$selectedStatus = "status='".$session->scratch->get("userSearchStatus")."'";
} else {
$selectedStatus = "status like '%'";
$selectedStatus = "status='".$session->scratch->get("userSearchStatus")."' and ";
}
my $keyword = $session->scratch->get("userSearchKeyword");
if ($session->scratch->get("userSearchModifier") eq "startsWith") {
@ -227,7 +225,7 @@ sub doUserSearch {
}
my $sql = "select users.userId, users.username, users.status, users.dateCreated, users.lastUpdated,
users.email from users
where $selectedStatus and (users.username like ? or alias like ? or email like ?
where $selectedStatus (users.username like ? or alias like ? or email like ?
or firstName like ? or lastName like ? or CONCAT(firstName, ' ', lastName) LIKE ? )
and users.userId not in (".$session->db->quoteAndJoin($userFilter).") order by users.username";
if ($returnPaginator) {