User administration search
This commit is contained in:
parent
37b4463a2b
commit
d12e676a7f
2 changed files with 4 additions and 3 deletions
|
|
@ -5,6 +5,7 @@
|
||||||
- fix: Empty user-created version tags
|
- fix: Empty user-created version tags
|
||||||
- fix: TagCloud (Keywords.pm)
|
- fix: TagCloud (Keywords.pm)
|
||||||
- fix: Cache pod does not accurately reflect the Module usage
|
- fix: Cache pod does not accurately reflect the Module usage
|
||||||
|
- fix: User administration search
|
||||||
- fix: XHTML 1.0 strict, FileUploadControl.js, resizable textarea
|
- fix: XHTML 1.0 strict, FileUploadControl.js, resizable textarea
|
||||||
- fix: undefined activity
|
- fix: undefined activity
|
||||||
- Polls now use JSON instead of Storable to serialize graph config
|
- Polls now use JSON instead of Storable to serialize graph config
|
||||||
|
|
|
||||||
|
|
@ -181,15 +181,15 @@ sub doUserSearch {
|
||||||
} else {
|
} else {
|
||||||
$keyword = "%".$keyword;
|
$keyword = "%".$keyword;
|
||||||
}
|
}
|
||||||
$keyword = $session->db->quote($keyword);
|
|
||||||
my $sql = "select users.userId, users.username, users.status, users.dateCreated, users.lastUpdated,
|
my $sql = "select users.userId, users.username, users.status, users.dateCreated, users.lastUpdated,
|
||||||
userProfileData.email from users
|
userProfileData.email from users
|
||||||
left join userProfileData on users.userId=userProfileData.userId
|
left join userProfileData on users.userId=userProfileData.userId
|
||||||
where $selectedStatus and (users.username like ".$keyword." or alias like ".$keyword." or email like ".$keyword.")
|
where $selectedStatus and (users.username like ? or alias like ? or email like ?
|
||||||
|
or firstName like ? or lastName like ?)
|
||||||
and users.userId not in (".$session->db->quoteAndJoin($userFilter).") order by users.username";
|
and users.userId not in (".$session->db->quoteAndJoin($userFilter).") order by users.username";
|
||||||
if ($returnPaginator) {
|
if ($returnPaginator) {
|
||||||
my $p = WebGUI::Paginator->new($session,$session->url->page("op=".$op));
|
my $p = WebGUI::Paginator->new($session,$session->url->page("op=".$op));
|
||||||
$p->setDataByQuery($sql);
|
$p->setDataByQuery($sql, undef, undef, [$keyword, $keyword, $keyword, $keyword, $keyword]);
|
||||||
return $p;
|
return $p;
|
||||||
} else {
|
} else {
|
||||||
my $sth = $session->db->read($sql);
|
my $sth = $session->db->read($sql);
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue