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

merging 5.5.4 bugfixes

Browse source
This commit is contained in:
JT Smith 2003-12-30 02:28:26 +00:00
parent 78d649c379
commit fe7f92f591
2 changed files with 4 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

5
lib/WebGUI/Operation/Group.pm
View file

@ -447,14 +447,15 @@ sub www_manageUsersInGroupSecondary {
return WebGUI::Privilege::adminOnly() unless _hasSecondaryPrivilege($session{form}{gid}); return WebGUI::Privilege::adminOnly() unless _hasSecondaryPrivilege($session{form}{gid});
my ($output, $sth, %hash); my ($output, $sth, %hash);
tie %hash, 'Tie::CPHash'; tie %hash, 'Tie::CPHash';
$output = '<h1>'.WebGUI::International::get(88).'</h1>'; my $group = WebGUI::Group->new($session{form}{gid});
$output = '<h1>'.WebGUI::International::get(88).' '.$group->name.'</h1>';
my $f = WebGUI::HTMLForm->new; my $f = WebGUI::HTMLForm->new;
$f->hidden("gid",$session{form}{gid}); $f->hidden("gid",$session{form}{gid});
$f->hidden("op","addUsersToGroupSecondarySave"); $f->hidden("op","addUsersToGroupSecondarySave");
my $existingUsers = WebGUI::Grouping::getUsersInGroup($session{form}{gid}); my $existingUsers = WebGUI::Grouping::getUsersInGroup($session{form}{gid});
push(@{$existingUsers},"1"); push(@{$existingUsers},"1");
push(@{$existingUsers},"3"); push(@{$existingUsers},"3");
my $users = WebGUI::SQL->buildHashRef("select userId,username from users where status='Active' and userId not in (".join(",",@{$existingUsers}).")"); my $users = WebGUI::SQL->buildHashRef("select userId,username from users where status='Active' and userId not in (".join(",",@{$existingUsers}).") order by username");
$f->selectList( $f->selectList(
-name=>"users", -name=>"users",
-label=>WebGUI::International::get(976), -label=>WebGUI::International::get(976),

2
lib/WebGUI/Operation/Statistics.pm
View file

@ -184,7 +184,7 @@ sub www_viewStatistics {
$output .= '<tr><td align="right" class="tableHeader">'.WebGUI::International::get(427).':</td><td class="tableData">'.$data.'</td></tr>'; $output .= '<tr><td align="right" class="tableHeader">'.WebGUI::International::get(427).':</td><td class="tableData">'.$data.'</td></tr>';
($data) = WebGUI::SQL->quickArray("select count(*) from template where templateId>1000"); ($data) = WebGUI::SQL->quickArray("select count(*) from template where templateId>1000");
$output .= '<tr><td align="right" class="tableHeader">'.WebGUI::International::get(792).':</td><td class="tableData">'.$data.'</td></tr>'; $output .= '<tr><td align="right" class="tableHeader">'.WebGUI::International::get(792).':</td><td class="tableData">'.$data.'</td></tr>';
($data) = WebGUI::SQL->quickArray("select count(*) from collateral where collateralId>1000"); ($data) = WebGUI::SQL->quickArray("select count(*) from collateral");
$output .= '<tr><td align="right" class="tableHeader">'.WebGUI::International::get(793).':</td><td class="tableData">'.$data.'</td></tr>'; $output .= '<tr><td align="right" class="tableHeader">'.WebGUI::International::get(793).':</td><td class="tableData">'.$data.'</td></tr>';
($data) = WebGUI::SQL->quickArray("select count(*) from userSession"); ($data) = WebGUI::SQL->quickArray("select count(*) from userSession");
$output .= '<tr><td align="right" class="tableHeader">'.WebGUI::International::get(146).':</td><td class="tableData">'.$data.'</td></tr>'; $output .= '<tr><td align="right" class="tableHeader">'.WebGUI::International::get(146).':</td><td class="tableData">'.$data.'</td></tr>';