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

Update Macros for wg8 instanciators.

Browse source
This commit is contained in:
Colin Kuskie 2010-03-04 08:48:27 -08:00
parent 35e1e8c943
commit f17fc5c7ad
12 changed files with 39 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

2
lib/WebGUI/Macro/AdminToggle.pm
View file

@ -60,7 +60,7 @@ sub process {
$var{'toggle.text'} = $turnOn || $i18n->get(516);
}
my $template = $templateName ? WebGUI::Asset::Template->newByUrl($session, $templateName)
: WebGUI::Asset::Template->new($session, "PBtmpl0000000000000036");
: WebGUI::Asset::Template->newById($session, "PBtmpl0000000000000036");
return $template->process(\%var);
}

46
lib/WebGUI/Macro/EditableToggle.pm
View file

@ -48,28 +48,30 @@ The URL of a template from the Macro/EditableToggle namespace to use for formatt
#-------------------------------------------------------------------
sub process {
my $session = shift;
if ($session->asset && $session->asset->canEdit && $session->user->isInGroup(12)) {
my %var;
my @param = @_;
my $i18n = WebGUI::International->new($session,'Macro_EditableToggle');
my $turnOn = $param[0] || $i18n->get(516);
my $turnOff = $param[1] || $i18n->get(517);
if ($session->var->isAdminOn) {
$var{'toggle.url'} = $session->url->page('op=switchOffAdmin');
$var{'toggle.text'} = $turnOff;
} else {
$var{'toggle.url'} = $session->url->page('op=switchOnAdmin');
$var{'toggle.text'} = $turnOn;
}
if ($param[2]) {
return WebGUI::Asset::Template->newByUrl($session,$param[2])->process(\%var);
} else {
return WebGUI::Asset::Template->new($session,"PBtmpl0000000000000038")->process(\%var);
}
}
return "";
}
my $session = shift;
if ( $session->asset && $session->asset->canEdit && $session->user->isInGroup(12) ) {
my %var;
my @param = @_;
my $i18n = WebGUI::International->new( $session, 'Macro_EditableToggle' );
my $turnOn = $param[0] || $i18n->get(516);
my $turnOff = $param[1] || $i18n->get(517);
if ( $session->var->isAdminOn ) {
$var{'toggle.url'} = $session->url->page('op=switchOffAdmin');
$var{'toggle.text'} = $turnOff;
}
else {
$var{'toggle.url'} = $session->url->page('op=switchOnAdmin');
$var{'toggle.text'} = $turnOn;
}
if ( $param[2] ) {
return WebGUI::Asset::Template->newByUrl( $session, $param[2] )->process( \%var );
}
else {
return WebGUI::Asset::Template->newById( $session, "PBtmpl0000000000000038" )->process( \%var );
}
} ## end if ( $session->asset &&...)
return "";
} ## end sub process
1;

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

@ -57,7 +57,7 @@ sub process {
if ($template) {
return WebGUI::Asset::Template->newByUrl($session,$template)->process(\%var);
} else {
return WebGUI::Asset::Template->new($session,"PBtmpl0000000000000040")->process(\%var);
return WebGUI::Asset::Template->newById($session,"PBtmpl0000000000000040")->process(\%var);
}
}

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

@ -57,7 +57,7 @@ sub process {
if ($template) {
return WebGUI::Asset::Template->newByUrl($session,$template)->process(\%var);
} else {
return WebGUI::Asset::Template->new($session,"PBtmpl0000000000000041")->process(\%var);
return WebGUI::Asset::Template->newById($session,"PBtmpl0000000000000041")->process(\%var);
}
}

2
lib/WebGUI/Macro/H_homeLink.pm
View file

@ -57,7 +57,7 @@ sub process {
if ($templateUrl) {
return WebGUI::Asset::Template->newByUrl($session,$templateUrl)->process(\%var);
} else {
return WebGUI::Asset::Template->new($session,"PBtmpl0000000000000042")->process(\%var);
return WebGUI::Asset::Template->newById($session,"PBtmpl0000000000000042")->process(\%var);
}
}
return $home->getUrl;

2
lib/WebGUI/Macro/L_loginBox.pm
View file

@ -127,7 +127,7 @@ sub process {
$var{'account.create.url'} = $session->url->page('op=auth;method=createAccount');
$var{'account.create.label'} = $i18n->get(407, 'WebGUI');
$var{'form.footer'} = WebGUI::Form::formFooter($session,);
return WebGUI::Asset::Template->new($session,$templateId)->process(\%var);
return WebGUI::Asset::Template->newById($session,$templateId)->process(\%var);
}
1;

2
lib/WebGUI/Macro/LoginToggle.pm
View file

@ -63,7 +63,7 @@ sub process {
if ($param[2]) {
return WebGUI::Asset::Template->newByUrl($session,$param[2])->process(\%var);
} else {
return WebGUI::Asset::Template->new($session,"PBtmpl0000000000000043")->process(\%var);
return WebGUI::Asset::Template->newById($session,"PBtmpl0000000000000043")->process(\%var);
}
}

2
lib/WebGUI/Macro/MiniCart.pm
View file

@ -59,7 +59,7 @@ sub process {
totalPrice => sprintf("%.2f",$totalPrice),
totalItems => $totalItems,
);
my $template = WebGUI::Asset::Template->new($session, $templateId || 'EBlxJpZQ9o-8VBOaGQbChA');
my $template = WebGUI::Asset::Template->newById($session, $templateId || 'EBlxJpZQ9o-8VBOaGQbChA');
return $template->process(\%var);
}

8
lib/WebGUI/Macro/RandomThread.pm
View file

@ -80,7 +80,7 @@ sub process {
return '';
}
my $template = eval { $templateURL ? WebGUI::Asset::Template->newByUrl($session,$templateURL) : WebGUI::Asset::Template->new($session,'WVtmpl0000000000000001'); };
my $template = eval { $templateURL ? WebGUI::Asset::Template->newByUrl($session,$templateURL) : WebGUI::Asset::Template->newById($session,'WVtmpl0000000000000001'); };
if (Exception::Class->caught()) {
$session->errorHandler->warn('Error: invalid template URL. Check parameters of macro on page '.$session->asset->url);
return '';
@ -98,7 +98,7 @@ sub process {
foreach my $csid (@{$lineage}) {
my $cs = undef;
# Get random thread in that CS:
$cs = WebGUI::Asset::Wobject::Collaboration->new($session,$csid);
$cs = WebGUI::Asset::Wobject::Collaboration->newById($session,$csid);
my $threads = $cs->getLineage(['children'],{includeOnlyClasses => ['WebGUI::Asset::Post::Thread']});
push(@llist,$csid) if (scalar(@{$threads}) > 0);
}
@ -152,13 +152,13 @@ sub _getRandomThread {
# Get random CS:
my $randomIndex = int(rand(scalar(@{$lineage})));
my $randomCSId = $lineage->[$randomIndex];
my $randomCS = WebGUI::Asset::Wobject::Collaboration->new($session, $randomCSId);
my $randomCS = WebGUI::Asset::Wobject::Collaboration->newById($session, $randomCSId);
# Get random thread in that CS:
$lineage = $randomCS->getLineage(['children'], {includeOnlyClasses => ['WebGUI::Asset::Post::Thread']});
$randomIndex = int(rand(scalar(@{$lineage})));
my $randomThreadId = $lineage->[$randomIndex];
return WebGUI::Asset::Post::Thread->new($session, $randomThreadId);
return WebGUI::Asset::Post::Thread->newById($session, $randomThreadId);
}
1;

2
lib/WebGUI/Macro/UsersOnline.pm
View file

@ -118,7 +118,7 @@ sub process {
$var{'lastActivity_label'} = $i18n->get("Last Activity");
# Process Template
return WebGUI::Asset::Template->new($session,$templateId)->process(\%var);
return WebGUI::Asset::Template->newById($session,$templateId)->process(\%var);
}
#-------------------------------------------------------------------

4
lib/WebGUI/Macro/a_account.pm
View file

@ -47,9 +47,9 @@ sub process {
$var{'account.url'} = $session->url->page('op=auth;method=init');
$var{'account.text'} = $param[0] || $i18n->get(46);
if ($param[1]) {
return WebGUI::Asset::Template->newByUrl($session,$param[1])->process(\%var);
return WebGUI::Asset::Template->newByUrl($session, $param[1])->process(\%var);
} else {
return WebGUI::Asset::Template->new($session,"PBtmpl0000000000000037")->process(\%var);
return WebGUI::Asset::Template->newById($session, "PBtmpl0000000000000037")->process(\%var);
}
}

2
lib/WebGUI/Macro/r_printable.pm
View file

@ -71,7 +71,7 @@ sub process {
if ($param[2]) {
$temp = WebGUI::Asset::Template->newByUrl($session,$param[2])->process(\%var);
} else {
$temp = WebGUI::Asset::Template->new($session,"PBtmpl0000000000000045")->process(\%var);
$temp = WebGUI::Asset::Template->newById($session,"PBtmpl0000000000000045")->process(\%var);
}
}
return $temp;