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

Add tests for GroupDelete and GroupAdd macros.

Browse source 
Fix bugs exposed by the tests.
This commit is contained in:
Colin Kuskie 2006-07-24 19:58:50 +00:00
parent 5a23f11707
commit 654e5751e8
5 changed files with 341 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

15
lib/WebGUI/Macro/GroupAdd.pm
View file

@ -43,20 +43,19 @@ An optional template for formatting the text and link.
#-------------------------------------------------------------------
sub process {
my @param = @_;
my $session = shift;
return "" if ($param[0] eq "");
return "" if ($param[1] eq "");
my ($session, $groupName, $text, $template) = @_;
return "" if ($groupName eq "");
return "" if ($text eq "");
return "" if ($session->user->userId eq '1');
my $g = WebGUI::Group->find($param[0]);
my $g = WebGUI::Group->find($session, $groupName);
return "" unless defined $g->getId;
return "" unless ($g->autoAdd);
return "" if ($session->user->isInGroup($g->getId));
my %var = ();
$var{'group.url'} = $session->url->page("op=autoAddToGroup;groupId=".$g->getId);
$var{'group.text'} = $param[1];
if ($param[2]) {
return WebGUI::Asset::Template->newByUrl($session,$param[2])->process(\%var);
$var{'group.text'} = $text;
if ($template) {
return WebGUI::Asset::Template->newByUrl($session,$template)->process(\%var);
} else {
return WebGUI::Asset::Template->new($session,"PBtmpl0000000000000040")->process(\%var);
}

19
lib/WebGUI/Macro/GroupDelete.pm
View file

@ -43,20 +43,19 @@ An optional template for formatting the text and link.
#-------------------------------------------------------------------
sub process {
my $session = shift;
my @param = @_;
return "" if ($param[0] eq "");
return "" if ($param[1] eq "");
my ($session, $groupName, $text, $template) = @_;
return "" if ($groupName eq "");
return "" if ($text eq "");
return "" if ($session->user->userId eq '1');
my $g = WebGUI::Group->find($param[0]);
return "" if ($g->getId eq "");
my $g = WebGUI::Group->find($session, $groupName);
return "" unless defined $g->getId;
return "" unless ($g->autoDelete);
return "" unless ($session->user->isInGroup($g->getId));
my %var = ();
$var{'group.url'} = $session->url->page("op=autoDeleteFromGroup;groupId=".$g->getId);
$var{'group.text'} = $param[1];
if ($param[2]) {
return WebGUI::Asset::Template->newByUrl($session,$param[2])->process(\%var);
$var{'group.url'} = $session->url->page("op=autoDeleteFromGroup;groupId=".$g->getId);
$var{'group.text'} = $text;
if ($template) {
return WebGUI::Asset::Template->newByUrl($session,$template)->process(\%var);
} else {
return WebGUI::Asset::Template->new($session,"PBtmpl0000000000000041")->process(\%var);
}