From 9110697a3aed94bb320f58491d8cbc676f858514 Mon Sep 17 00:00:00 2001
From: Colin Kuskie <colink@perldreamer.com>
Date: Mon, 24 Nov 2008 02:23:12 +0000
Subject: [PATCH] Forward porting fix for returning to the asset manager after
 deploying a package.

---
 docs/changelog/7.x.x.txt           | 1 +
 lib/WebGUI/AssetPackage.pm         | 7 ++++++-
 lib/WebGUI/Content/AssetManager.pm | 2 +-
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/docs/changelog/7.x.x.txt b/docs/changelog/7.x.x.txt
index e5004da29..5fc2bfe7c 100644
--- a/docs/changelog/7.x.x.txt
+++ b/docs/changelog/7.x.x.txt
@@ -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
diff --git a/lib/WebGUI/AssetPackage.pm b/lib/WebGUI/AssetPackage.pm
index f69dc1eac..8afbf295e 100644
--- a/lib/WebGUI/AssetPackage.pm
+++ b/lib/WebGUI/AssetPackage.pm
@@ -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;
 }
 
 #-------------------------------------------------------------------
diff --git a/lib/WebGUI/Content/AssetManager.pm b/lib/WebGUI/Content/AssetManager.pm
index 9a5994547..d9b6b2e17 100644
--- a/lib/WebGUI/Content/AssetManager.pm
+++ b/lib/WebGUI/Content/AssetManager.pm
@@ -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 />';