Peter M. Groen / knowledgetree

Commit 3dae48f48d8616e775eccab1337cd8ec3ae10dcd

Authored by Jarrett Jordaan
1 parent 166429b3

KTC-853, KTC-854: Refresh updated with new instructions for migration. 

Committed by: Jarrett Jordaan

Reviewed by: Megan Watson
Inline Side-by-side
Showing 3 changed files with 13 additions and 3 deletions
setup/upgrade/steps/upgradeComplete.php
  View file @3dae48f
... ... @@ -49,6 +49,10 @@ class upgradeComplete extends Step {
49 49  
50 50 public function doStep() {
51 51 $this->temp_variables = array("step_name"=>"complete", "silent"=>$this->silent);
  52 + $this->temp_variables['isCE'] = false;
  53 + $type = $this->util->getVersionType();
  54 + if($type == "community")
  55 + $this->temp_variables['isCE'] = true;
52 56 $this->doRun();
53 57 $this->storeSilent();
54 58 return 'landing';
... ...
setup/upgrade/templates/complete.tpl
  View file @3dae48f
... ... @@ -27,7 +27,11 @@
27 27 dmsctl.bat install<br/>
28 28 dmsctl.bat start
29 29 <?php } else { ?>
30   - cd /usr/share/knowledgetree-ce<br/>
  30 + <?php if ($isCE) { ?>
  31 + cd /usr/share/knowledgetree-ce<br/>
  32 + <?php } else { ?>
  33 + cd /usr/share/knowledgetree<br/>
  34 + <?php } ?>
31 35 sudo ./dmsctl.sh start
32 36 <?php } ?>
33 37 </p>
... ...
setup/upgrade/templates/database.tpl
  View file @3dae48f
... ... @@ -50,10 +50,12 @@
50 50 <?php }
51 51 else if ($action == 'runUpgrade') { ?>
52 52 <?php if ($backupSuccessful) { ?>
53   - <script type="text/javascript">
54 53 <?php if($migrateCheck) { ?>
55   - 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.");
  54 + <script type="text/javascript">
  55 + 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.");
  56 + </script>
56 57 <?php } else { ?>
  58 + <script type="text/javascript">
57 59 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.")
58 60 </script>
59 61 <?php } ?>
... ...