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

tons more fixes. getting closer to gamma.

Browse source
This commit is contained in:
Matthew Wilson 2006-01-21 21:12:14 +00:00
parent fa5439b099
commit 9c7e8699a2
9 changed files with 65 additions and 48 deletions
Download patch file Download diff file Expand all files Collapse all files

12
lib/WebGUI/Operation/Commerce.pm
View file

@ -100,7 +100,7 @@ sub www_cancelTransaction {
my $i18n = WebGUI::International->new($session, 'Commerce');
$var{message} = $i18n->get('checkout canceled message');
return $session->style->userStyle(WebGUI::Asset::Template->new($session->setting->get("commerceCheckoutCanceledTemplateId"))->process(\%var));
return $session->style->userStyle(WebGUI::Asset::Template->new($session,$session->setting->get("commerceCheckoutCanceledTemplateId"))->process(\%var));
}
# This operation is here for easier future extensions to the commerce system.
@ -191,7 +191,7 @@ sub www_checkoutConfirm {
$var{'viewShoppingCart.url'} = $session->url->page('op=viewCart');
$var{'viewShoppingCart.label'} = $i18n->get('view shopping cart');
return $session->style->userStyle(WebGUI::Asset::Template->new($session->setting->get("commerceConfirmCheckoutTemplateId"))->process(\%var));
return $session->style->userStyle(WebGUI::Asset::Template->new($session,$session->setting->get("commerceConfirmCheckoutTemplateId"))->process(\%var));
}
#-------------------------------------------------------------------
@ -321,7 +321,7 @@ sub www_checkoutSubmit {
return WebGUI::Operation::execute($session,'viewPurchaseHistory') unless ($checkoutError);
# If an error has occurred show the template errorlog
return $session->style->userStyle(WebGUI::Asset::Template->new($session->setting->get("commerceTransactionErrorTemplateId"))->process(\%param));
return $session->style->userStyle(WebGUI::Asset::Template->new($session,$session->setting->get("commerceTransactionErrorTemplateId"))->process(\%param));
}
#-------------------------------------------------------------------
@ -690,7 +690,7 @@ sub www_selectPaymentGateway {
$var{formSubmit} = WebGUI::Form::submit($session,{value=>$i18n->get('payment gateway select')});
$var{formFooter} = WebGUI::Form::formFooter;
return $session->style->userStyle(WebGUI::Asset::Template->new($session->setting->get("commerceSelectPaymentGatewayTemplateId"))->process(\%var));
return $session->style->userStyle(WebGUI::Asset::Template->new($session,$session->setting->get("commerceSelectPaymentGatewayTemplateId"))->process(\%var));
}
#-------------------------------------------------------------------
@ -736,7 +736,7 @@ sub www_selectShippingMethod {
$var{formSubmit} = WebGUI::Form::submit($session,{value=>$i18n->get('shipping select button')});
$var{formFooter} = WebGUI::Form::formFooter;
return $session->style->userStyle(WebGUI::Asset::Template->new($session->setting->get("commerceSelectShippingMethodTemplateId"))->process(\%var));
return $session->style->userStyle(WebGUI::Asset::Template->new($session,$session->setting->get("commerceSelectShippingMethodTemplateId"))->process(\%var));
}
#-------------------------------------------------------------------
@ -826,7 +826,7 @@ sub www_viewCart {
$var{total} = sprintf('%.2f', $total);
return $session->style->userStyle(WebGUI::Asset::Template->new($session->setting->get("commerceViewShoppingCartTemplateId"))->process(\%var));
return $session->style->userStyle(WebGUI::Asset::Template->new($session,$session->setting->get("commerceViewShoppingCartTemplateId"))->process(\%var));
}
1;

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

@ -410,7 +410,7 @@ sub www_editGroup {
sub www_editGroupSave {
my $session = shift; use WebGUI; WebGUI::dumpSession($session);
return $session->privilege->adminOnly() unless ($session->user->isInGroup(3) || _hasSecondaryPrivilege($session,$session->form->process("gid")));
my $g = WebGUI::Group->new($session->form->process("gid"));
my $g = WebGUI::Group->new($session,$session->form->process("gid"));
$g->description($session->form->process("description"));
$g->name($session->form->process("groupName"));
$g->expireOffset($session->form->interval("expireOffset"));

8
lib/WebGUI/Operation/Help.pm
View file

@ -117,7 +117,7 @@ sub www_viewHelp {
my @related = _related($session, $help->{related});
foreach my $row (@related) {
my $relatedHelp = _get($session,$row->{tag},$row->{namespace});
$ac->addSubmenuItem(_link($row->{tag},$row->{namespace}),$i18n->get($relatedHelp->{title},$row->{namespace}));
$ac->addSubmenuItem(_link($session,$row->{tag},$row->{namespace}),$i18n->get($relatedHelp->{title},$row->{namespace}));
}
my %vars;
$vars{body} = $i18n->get($help->{body});
@ -159,7 +159,7 @@ sub www_viewHelpIndex {
@helpIndex = sort { $a->[2] cmp $b->[2] } @helpIndex;
foreach my $helpEntry (@helpIndex) {
my ($namespace, $id, $title) = @{ $helpEntry };
$output .= '<p><a href="'._link($id,$namespace).'">'.$title.'</a></p>';
$output .= '<p><a href="'._link($session,$id,$namespace).'">'.$title.'</a></p>';
$i++;
if ($i == $halfway) {
$output .= '</td><td valign="top">';
@ -189,7 +189,7 @@ sub www_viewHelpTOC {
@entries = sort { $a->[0] cmp $b->[0] } @entries;
foreach my $helpEntry (@entries) {
my ($helpName, $helpFile) = @{ $helpEntry };
$output .= '<p><a href="'._linkTOC($helpFile).'">'.$helpName."</a></p>\n";
$output .= '<p><a href="'._linkTOC($session,$helpFile).'">'.$helpName."</a></p>\n";
$i++;
if ($i % $third == 0) {
$output .= '</td><td valign="top">';
@ -212,7 +212,7 @@ sub www_viewHelpChapter {
my $output = '';
my $i18n = WebGUI::International->new($session);
foreach my $id (@entries) {
$output .= '<p><a href="'._link($id,$namespace).'">'.$i18n->get($help->{$id}{title},$namespace).'</a></p>';
$output .= '<p><a href="'._link($session,$id,$namespace).'">'.$i18n->get($help->{$id}{title},$namespace).'</a></p>';
}
my $ac = WebGUI::AdminConsole->new($session,"help");
$ac->addSubmenuItem($session->url->page('op=viewHelpIndex'),$i18n->get(95));