From a6310883aa3b36a871483a709172324b4a1dbfae Mon Sep 17 00:00:00 2001
From: michael <michael@c91229c3-7414-0410-bfa2-8a42b809f60b>
Date: Wed, 30 Jul 2003 13:41:04 +0000
Subject: [PATCH] added querystring to statusPage method and updated calls from removeGroup

---
 presentation/Html.inc                                                                   |  4 ++--
 presentation/lookAndFeel/knowledgeTree/administration/groupmanagement/removeGroupBL.php | 10 +++++-----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/presentation/Html.inc b/presentation/Html.inc
index 104fa54..5d8edac 100644
--- a/presentation/Html.inc
+++ b/presentation/Html.inc
@@ -23,7 +23,7 @@ function renderHeading($sHeading, $sSectionName = "") {
     return $sToRender;	
 }
 
-function statusPage($sTitle, $sHeading, $sCancelAction, $sText = "") {
+function statusPage($sTitle, $sHeading, $sText = "", $sCancelAction, $sQueryString = "") {
     global $default;
     $sToRender .= renderHeading($sTitle);
     $sToRender .= "<table>\n";
@@ -31,7 +31,7 @@ function statusPage($sTitle, $sHeading, $sCancelAction, $sText = "") {
     $sToRender .= "<td><b>$sHeading</b></td>\n";
     $sToRender .= "</tr>\n";
     $sToRender .= "<tr><td>$sText</td></tr>\n";
-    $sToRender .= "<tr><td align=\"right\">" . generateControllerLink("listGroups", "", "<img src =\"$default->graphicsUrl/widgets/back.gif\" border=\"0\"/>") . "</td></tr>\n";
+    $sToRender .= "<tr><td align=\"right\">" . generateControllerLink($sCancelAction, $sQueryString, "<img src =\"$default->graphicsUrl/widgets/back.gif\" border=\"0\"/>") . "</td></tr>\n";
     $sToRender .= "</table>\n";
     return $sToRender;
 }
diff --git a/presentation/lookAndFeel/knowledgeTree/administration/groupmanagement/removeGroupBL.php b/presentation/lookAndFeel/knowledgeTree/administration/groupmanagement/removeGroupBL.php
index 6d12cc7..e652d1d 100644
--- a/presentation/lookAndFeel/knowledgeTree/administration/groupmanagement/removeGroupBL.php
+++ b/presentation/lookAndFeel/knowledgeTree/administration/groupmanagement/removeGroupBL.php
@@ -31,22 +31,22 @@ if (checkSession()) {
 				if (isset($fForDelete)) {
 					if ($oGroup->delete()) {
 						// FIXME: refactor getStatusPage in Html.inc
-						$oPatternCustom->setHtml(statusPage("Remove Group", "Group successfully removed!", "listGroups"));
+						$oPatternCustom->setHtml(statusPage("Remove Group", "Group successfully removed!", "", "listGroups"));
 					} else {
-						$oPatternCustom->setHtml(statusPage("Remove Group", "Group deletion failed!", "listGroups", "There was an error deleting this group.  Please try again later."));
+						$oPatternCustom->setHtml(statusPage("Remove Group", "Group deletion failed!", "There was an error deleting this group.  Please try again later.", "listGroups"));
 					}
 				} else {
 					$oPatternCustom->setHtml(getDeletePage($fGroupID));
 					$main->setFormAction($_SERVER["PHP_SELF"] . "?fForDelete=1");
 				}
 			} else {
-				$oPatternCustom->setHtml(statusPage("Remove Group", "This group is in a unit!", "listGroups", "This group can not be deleted because it belongs to a unit."));
+				$oPatternCustom->setHtml(statusPage("Remove Group", "This group is in a unit!", "This group can not be deleted because it belongs to a unit.", "listGroups"));
 			}					
 		} else {
-			$oPatternCustom->setHtml(statusPage("Remove Group", "This group has users!", "listGroups", "This group can not be deleted because there are still users in it."));
+			$oPatternCustom->setHtml(statusPage("Remove Group", "This group has users!", "This group can not be deleted because there are still users in it.", "listGroups"));
 		}
 	} else {
-		$oPatternCustom->setHtml(statusPage("Remove Group", "No group was selected for deletion", "listGroups"));
+		$oPatternCustom->setHtml(statusPage("Remove Group", "No group was selected for deletion", "", "listGroups"));
 	}
 	
 	$main->setCentralPayload($oPatternCustom);				
--
libgit2 0.21.4