From 3dae48f48d8616e775eccab1337cd8ec3ae10dcd Mon Sep 17 00:00:00 2001
From: Jarrett Jordaan <jarrett@knowledgetree.com>
Date: Tue, 24 Nov 2009 10:29:15 +0200
Subject: [PATCH] KTC-853, KTC-854: Refresh updated with new instructions for migration.

---
 setup/upgrade/steps/upgradeComplete.php | 4 ++++
 setup/upgrade/templates/complete.tpl    | 6 +++++-
 setup/upgrade/templates/database.tpl    | 6 ++++--
 3 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/setup/upgrade/steps/upgradeComplete.php b/setup/upgrade/steps/upgradeComplete.php
index 0e458f6..6047718 100644
--- a/setup/upgrade/steps/upgradeComplete.php
+++ b/setup/upgrade/steps/upgradeComplete.php
@@ -49,6 +49,10 @@ class upgradeComplete extends Step {
 	
     public function doStep() {
     	$this->temp_variables = array("step_name"=>"complete", "silent"=>$this->silent);
+    	$this->temp_variables['isCE'] = false;
+		$type = $this->util->getVersionType();
+		if($type == "community")
+		 	$this->temp_variables['isCE'] = true;
         $this->doRun();
         $this->storeSilent();
     	return 'landing';
diff --git a/setup/upgrade/templates/complete.tpl b/setup/upgrade/templates/complete.tpl
index 53282b2..c37c3a2 100644
--- a/setup/upgrade/templates/complete.tpl
+++ b/setup/upgrade/templates/complete.tpl
@@ -27,7 +27,11 @@
 				dmsctl.bat install<br/>
 				dmsctl.bat start
 			<?php } else { ?>
-				cd /usr/share/knowledgetree-ce<br/>
+				<?php if ($isCE) { ?>
+					cd /usr/share/knowledgetree-ce<br/>
+				<?php } else { ?>
+					cd /usr/share/knowledgetree<br/>
+				<?php } ?>
 				sudo ./dmsctl.sh start
 			<?php } ?>
 			</p>
diff --git a/setup/upgrade/templates/database.tpl b/setup/upgrade/templates/database.tpl
index a9716ef..6c56a5f 100644
--- a/setup/upgrade/templates/database.tpl
+++ b/setup/upgrade/templates/database.tpl
@@ -50,10 +50,12 @@
     <?php }
     else if ($action == 'runUpgrade') { ?>
 		<?php if ($backupSuccessful) { ?>
-		<script type="text/javascript">
 		<?php if($migrateCheck) { ?>
-		alert("To complete the upgrade please do the following before continuing:\n\n1. Hard refresh your bowser (CTRL-F5) on first view of the Dashboard.\n\n\nSelect 'Finish' at the bottom of this page to continue.");
+		<script type="text/javascript">
+		alert("To complete the upgrade please do the following before continuing:\n\n1. Hard refresh your browser (CTRL-F5) on first view of the Dashboard.\n\n\nSelect 'Finish' at the bottom of this page to continue.");
+		</script>
 		<?php } else { ?>
+		<script type="text/javascript">
         alert("To complete the upgrade please do the following before continuing:\n\n1. Restart the services as appropriate for your environment.\n\n\nOn first run of your upgraded installaton please do the following:\n\n1. Hard refresh your bowser (CTRL-F5) on first view of the Dashboard.\n2. Enable the new plugins you wish to use.\n\n\nSelect 'Finish' at the bottom of this page to continue.")
     </script>
     	<?php } ?>
--
libgit2 0.21.4