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

Make it work with debug mode turned on.

Browse source
This commit is contained in:
Colin Kuskie 2009-06-18 20:16:14 +00:00
parent 8f4e824004
commit fb6b201e77
2 changed files with 3 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
lib/WebGUI/AssetClipboard.pm
View file

@ -510,12 +510,11 @@ sub www_pasteList {
my @assetIds = $form->param('assetId');
$session->scratch->set('assetPasteList', JSON::to_json(\@assetIds));
if ($form->param('proceed') eq 'manageAssets') {
$session->scratch->set('assetPasteReturnUrl', $self->getUrl('op=manageAssets'));
$session->scratch->set('assetPasteReturnUrl', $self->getUrl('op=assetManager'));
}
else {
$session->scratch->set('assetPasteReturnUrl', $self->getUrl);
}
$session->scratch->set('assetPasteList', JSON::to_json(\@assetIds));
##Need to set the URL that should be displayed when it is done
my $i18n = WebGUI::International->new($session, 'Asset');
$pb->setIcon($session->url->extras('adminConsole/assets.gif'));
@ -542,6 +541,7 @@ sub www_pasteListStatus {
return $session->privilege->insufficient('no style')."return to site";
}
my $assetIds = $session->scratch->get('assetPasteList') || '[]';
$session->scratch->delete('assetPasteList');
my @assetIds = @{ JSON::from_json($assetIds) };
my $i18n = WebGUI::International->new($session, 'Asset');
ASSET: foreach my $clipId (@assetIds) {

1
lib/WebGUI/ProgressBar.pm
View file

@ -71,6 +71,7 @@ A message to be displayed in the status bar.
sub print {
my $self = shift;
my $message = shift; ##JS string escaping?
$self->session->log->preventDebugOutput;
$self->{_counter} += 1;
my $text = sprintf(<<EOJS, $self->{_counter}, $message);
<script>