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

Forward porting fix for returning to the asset manager after deploying a package.

Browse source
This commit is contained in:
Colin Kuskie 2008-11-24 02:23:12 +00:00
parent 09d545197a
commit 9110697a3a
3 changed files with 8 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

1
docs/changelog/7.x.x.txt
View file

@ -52,6 +52,7 @@
- fixed #8925: Collaboration System: Label missing
- fixed #8908: No Post Captcha in Default Submission Form
- fixed #9138: Fat fonts break WebGUI captchas
- fixed #8982: Deploy package doesn't take back to asset manager
7.6.3
- improved performance of file uploads

7
lib/WebGUI/AssetPackage.pm
View file

@ -286,7 +286,12 @@ sub www_deployPackage {
$deployedTreeMaster->update({isPackage=>0, styleTemplateId=>$self->get("styleTemplateId")});
}
}
return "";
if ($self->session->form->param("proceed") eq "manageAssets") {
$self->session->http->setRedirect($self->getUrl('op=assetManager'));
} else {
$self->session->http->setRedirect($self->getUrl());
}
return undef;
}
#-------------------------------------------------------------------

2
lib/WebGUI/Content/AssetManager.pm
View file

@ -490,7 +490,7 @@ ENDHTML
$output .= '<div class="functionPane"><fieldset> <legend>'.$i18n->get("packages").'</legend>';
foreach my $asset (@{$currentAsset->getPackageList}) {
$output .= '<p style="display:inline;vertical-align:middle;"><img src="'.$asset->getIcon(1).'" alt="'.$asset->getName.'" style="vertical-align:middle;border: 0px;" /></p>
<a href="'.$currentAsset->getUrl("func=deployPackage;assetId=".$asset->getId).'">'.$asset->getTitle.'</a> '
<a href="'.$currentAsset->getUrl("func=deployPackage;assetId=".$asset->getId.";proceed=manageAssets").'">'.$asset->getTitle.'</a> '
.$session->icon->edit("func=edit;proceed=manageAssets",$asset->get("url"))
.$session->icon->export("func=exportPackage",$asset->get("url"))
.'<br />';