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

merging bugfixes from 6.6.3

Browse source
This commit is contained in:
JT Smith 2005-06-16 00:16:52 +00:00
parent 60bd9ea317
commit 9246824759
9 changed files with 1937 additions and 6997 deletions
Download patch file Download diff file Expand all files Collapse all files

22
lib/WebGUI/Asset.pm
View file

@ -1687,11 +1687,11 @@ Returns a toolbar with a set of icons that hyperlink to functions that delete, e
sub getToolbar {
my $self = shift;
my $toolbar = deleteIcon('func=delete',$self->getUrl,WebGUI::International::get(43,"Asset"))
.editIcon('func=edit',$self->getUrl)
.cutIcon('func=cut',$self->getUrl)
.copyIcon('func=copy',$self->getUrl);
$toolbar .= shortcutIcon('func=createShortcut',$self->getUrl) unless ($self->get("className") =~ /Shortcut/);
my $toolbar = deleteIcon('func=delete',$self->get("url"),WebGUI::International::get(43,"Asset"))
.editIcon('func=edit',$self->get("url"))
.cutIcon('func=cut',$self->get("url"))
.copyIcon('func=copy',$self->get("url"));
$toolbar .= shortcutIcon('func=createShortcut',$self->get("url")) unless ($self->get("className") =~ /Shortcut/);
WebGUI::Style::setLink($session{config}{extrasURL}.'/contextMenu/contextMenu.css', {rel=>"stylesheet",type=>"text/css"});
WebGUI::Style::setScript($session{config}{extrasURL}.'/contextMenu/contextMenu.js', {type=>"text/javascript"});
#return '<img src="'.$self->getIcon(1).'" border="0" title="'.$self->getName.'" alt="'.$self->getName.'" align="absmiddle">'.$toolbar;
@ -3252,21 +3252,21 @@ sub www_manageAssets {
foreach my $link (@{$self->getAssetAdderLinks("proceed=manageAssets","assetContainers")}) {
$output .= '<img src="'.$link->{'icon.small'}.'" align="middle" alt="'.$link->{label}.'" border="0" />
<a href="'.$link->{url}.'">'.$link->{label}.'</a> ';
$output .= editIcon("func=edit&proceed=manageAssets",$link->{asset}->getUrl) if ($link->{isPrototype});
$output .= editIcon("func=edit&proceed=manageAssets",$link->{asset}->get("url")) if ($link->{isPrototype});
$output .= '<br />';
}
$output .= '<hr />';
foreach my $link (@{$self->getAssetAdderLinks("proceed=manageAssets")}) {
$output .= '<img src="'.$link->{'icon.small'}.'" align="middle" alt="'.$link->{label}.'" border="0" />
<a href="'.$link->{url}.'">'.$link->{label}.'</a> ';
$output .= editIcon("func=edit&proceed=manageAssets",$link->{asset}->getUrl) if ($link->{isPrototype});
$output .= editIcon("func=edit&proceed=manageAssets",$link->{asset}->get("url")) if ($link->{isPrototype});
$output .= '<br />';
}
$output .= '<hr />';
foreach my $link (@{$self->getAssetAdderLinks("proceed=manageAssets","utilityAssets")}) {
$output .= '<img src="'.$link->{'icon.small'}.'" align="middle" alt="'.$link->{label}.'" border="0" />
<a href="'.$link->{url}.'">'.$link->{label}.'</a> ';
$output .= editIcon("func=edit&proceed=manageAssets",$link->{asset}->getUrl) if ($link->{isPrototype});
$output .= editIcon("func=edit&proceed=manageAssets",$link->{asset}->get("url")) if ($link->{isPrototype});
$output .= '<br />';
}
$output .= '</fieldset></div>';
@ -3304,7 +3304,7 @@ sub www_manageAssets {
my $asset = WebGUI::Asset->newByDynamicClass($item->{assetId},$item->{className});
$packages .= '<img src="'.$asset->getIcon(1).'" align="middle" alt="'.$asset->getName.'" border="0" />
<a href="'.$self->getUrl("func=deployPackage&assetId=".$item->{assetId}).'">'.$item->{title}.'</a> '
.editIcon("func=edit&proceed=manageAssets",$asset->getUrl)
.editIcon("func=edit&proceed=manageAssets",$asset->get("url"))
.'<br />';
$hasPackages = 1;
}
@ -3369,8 +3369,8 @@ sub www_manageMetaData {
my $output;
my $fields = $self->getMetaDataFields();
foreach my $fieldId (keys %{$fields}) {
$output .= deleteIcon("func=deleteMetaDataField&fid=".$fieldId,$self->getUrl,WebGUI::International::get('deleteConfirm','Asset'));
$output .= editIcon("func=editMetaDataField&fid=".$fieldId,$self->getUrl);
$output .= deleteIcon("func=deleteMetaDataField&fid=".$fieldId,$self->get("url"),WebGUI::International::get('deleteConfirm','Asset'));
$output .= editIcon("func=editMetaDataField&fid=".$fieldId,$self->get("url"));
$output .= " <b>".$fields->{$fieldId}{fieldName}."</b><br>";
}
$ac->setHelp("metadata manage","Asset");

2
lib/WebGUI/Commerce/Payment/ITransact.pm
View file

@ -695,7 +695,7 @@ my %transactionData = %{$self->{_transactionParams}};
" <RecurringData>
<RecurRecipe>$transactionData{RECIPE}</RecurRecipe>
<RecurReps>$transactionData{TERM}</RecurReps>
<RecurTotal>$transactionData{INITIALAMT}</RecurTotal>
<RecurTotal>$transactionData{AMT}</RecurTotal>
<RecurDesc>$transactionData{DESCRIPTION}</RecurDesc>
</RecurringData>";
};

12
lib/WebGUI/HTTP.pm
View file

@ -156,14 +156,14 @@ The time that the cookie should remain in the browser. Defaults to "+10y" (10 ye
=cut
sub setCookie {
my $ttl = $_[2] || '+10y';
my $domain;
my $name = shift;
my $value = shift;
my $ttl = shift || '+10y';
push @{$session{http}{cookie}}, $session{cgi}->cookie(
-name=>$_[0],
-value=>$_[1],
-name=>$name,
-value=>$value,
-expires=>$ttl,
-path=>'/',
-domain=>$domain
-path=>'/'
);
}