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

fix for sf bug 1191744, default templates wrong

Browse source
This commit is contained in:
Colin Kuskie 2005-05-02 16:12:52 +00:00
parent 959872102e
commit ef4065559e
8 changed files with 8 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -28,7 +28,7 @@ use WebGUI::Utility;
sub process { sub process {
return "" unless ($session{var}{adminOn}); return "" unless ($session{var}{adminOn});
my @param = WebGUI::Macro::getParams($_[0]); my @param = WebGUI::Macro::getParams($_[0]);
my $templateId = $param[0] || "PBtmpl0000000000000090"; my $templateId = $param[0] || "PBtmpl0000000000000035";
my %var; my %var;
my (%cphash, %hash2, %hash, $r, @item, $query); my (%cphash, %hash2, %hash, $r, @item, $query);
tie %hash, "Tie::IxHash"; tie %hash, "Tie::IxHash";

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

@ -32,11 +32,7 @@ sub process {
$var{'toggle.url'} = WebGUI::URL::page('op=switchOnAdmin'); $var{'toggle.url'} = WebGUI::URL::page('op=switchOnAdmin');
$var{'toggle.text'} = $turnOn; $var{'toggle.text'} = $turnOn;
} }
if (defined $templateName) { return WebGUI::Asset::Template->newByUrl($templateName || "default_admin_toggle_macro")->process(\%var);
return WebGUI::Asset::Template->newByUrl($templateName)->process(\%var);
} else {
return WebGUI::Asset::Template->new("PBtmpl0000000000000036")->process(\%var);
}
} }
return ""; return "";
} }

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

@ -32,7 +32,7 @@ sub process {
$var{'toggle.url'} = WebGUI::URL::page('op=switchOnAdmin'); $var{'toggle.url'} = WebGUI::URL::page('op=switchOnAdmin');
$var{'toggle.text'} = $turnOn; $var{'toggle.text'} = $turnOn;
} }
return WebGUI::Asset::Template->newByUrl($param[2])->process(\%var); return WebGUI::Asset::Template->newByUrl($param[2] || "default_editable_toggle_macro")->process(\%var);
} }
return ""; return "";
} }

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

@ -31,7 +31,7 @@ sub process {
my %var = (); my %var = ();
$var{'group.url'} = WebGUI::URL::page("op=autoAddToGroup&groupId=".$g->groupId); $var{'group.url'} = WebGUI::URL::page("op=autoAddToGroup&groupId=".$g->groupId);
$var{'group.text'} = $param[1]; $var{'group.text'} = $param[1];
return WebGUI::Asset::Template->newByUrl($param[2])->process(\%var); return WebGUI::Asset::Template->newByUrl($param[2]||"default_group_add_macro")->process(\%var);
} }

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

@ -31,7 +31,7 @@ sub process {
my %var = (); my %var = ();
$var{'group.url'} = WebGUI::URL::page("op=autoDeleteFromGroup&groupId=".$g->groupId); $var{'group.url'} = WebGUI::URL::page("op=autoDeleteFromGroup&groupId=".$g->groupId);
$var{'group.text'} = $param[1]; $var{'group.text'} = $param[1];
return WebGUI::Asset::Template->newByUrl($param[2])->process(\%var); return WebGUI::Asset::Template->newByUrl($param[2] || "default_group_delete_macro")->process(\%var);
} }

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

@ -35,11 +35,7 @@ sub process {
} else { } else {
$var{'homeLink.text'} = WebGUI::International::get(47,'Macro_H_homelink'); $var{'homeLink.text'} = WebGUI::International::get(47,'Macro_H_homelink');
} }
if (defined $param[1]) { $temp = WebGUI::Asset::Template->newByUrl($param[1] || "default_homelink")->process(\%var);
$temp = WebGUI::Asset::Template->newByUrl($param[1])->process(\%var);
} else {
$temp = WebGUI::Asset::Template->new("PBtmpl0000000000000042")->process(\%var);
}
} }
return $temp; return $temp;
} }

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

@ -32,11 +32,7 @@ sub process {
$var{'toggle.url'} = WebGUI::URL::page('op=auth&method=logout'); $var{'toggle.url'} = WebGUI::URL::page('op=auth&method=logout');
$var{'toggle.text'} = $logout; $var{'toggle.text'} = $logout;
} }
if ($param[2]) { return WebGUI::Asset::Template->new($param[2] || "default_logintoggle")->process(\%var);
return WebGUI::Asset::Template->newByUrl($param[2])->process(\%var);
} else {
return WebGUI::Asset::Template->new("PBtmpl0000000000000043")->process(\%var);
}
} }

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

@ -38,11 +38,7 @@ sub process {
} else { } else {
$var{'printable.text'} = WebGUI::International::get(53,'Macro_r_printable'); $var{'printable.text'} = WebGUI::International::get(53,'Macro_r_printable');
} }
if ($param[2]) { $temp = WebGUI::Asset::Template->newByUrl($param[2] || "default_make_printable")->process(\%var);
$temp = WebGUI::Asset::Template->newByUrl($param[2])->process(\%var);
} else {
$temp = WebGUI::Asset::Template->new("PBtmpl0000000000000109")->process(\%var);
}
} }
return $temp; return $temp;
} }