From: hickert <hickert@594d385d-05f5-0310-b6e9-bd551577e9d8>
Date: Wed, 26 May 2010 11:57:44 +0000 (+0000)
Subject: Only display cehck button if needed
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=4a2770f6332812f345ff307e43267104c7523e44;p=gosa.git

Only display cehck button if needed


git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@18750 594d385d-05f5-0310-b6e9-bd551577e9d8
---

diff --git a/gosa-core/setup/class_setup.inc b/gosa-core/setup/class_setup.inc
index 54694846d..17e245ba2 100644
--- a/gosa-core/setup/class_setup.inc
+++ b/gosa-core/setup/class_setup.inc
@@ -230,7 +230,9 @@ class setup
                 $str .= "<button disabled type='submit' name='last'>".msgPool::backButton()."</button>";
             }
 
-            $str .= "<button type='submit' name='test'>"._("check")."</button>";
+            if($this->o_steps[$this->i_current]->b_displayCheckbutton){
+                $str .= "<button type='submit' name='test'>"._("check")."</button>";
+            }
             $str .= "<button type='submit' name='next'>"._("next")."</button>";
             $str .="</div>";
         }
diff --git a/gosa-core/setup/class_setupStep.inc b/gosa-core/setup/class_setupStep.inc
index 8393efc9d..3d350b343 100644
--- a/gosa-core/setup/class_setupStep.inc
+++ b/gosa-core/setup/class_setupStep.inc
@@ -28,6 +28,7 @@ class setup_step extends plugin
   var $is_active    = false;
   var $is_enabled   = false;
   var $is_completed = false;
+  var $b_displayCheckbutton = false;
 
   var $header_image = "images/setup/user.png";
 
diff --git a/gosa-core/setup/class_setupStep_Checks.inc b/gosa-core/setup/class_setupStep_Checks.inc
index 2a4d698b5..15f224c6b 100644
--- a/gosa-core/setup/class_setupStep_Checks.inc
+++ b/gosa-core/setup/class_setupStep_Checks.inc
@@ -26,6 +26,8 @@ class Step_Checks extends setup_step
   var $config_checks= array();
   var $is_writeable = array();
   var $header_image = "images/setup/system.png";
+    
+    var $b_displayCheckbutton = TRUE;
 
   function Step_Checks()
   {
diff --git a/gosa-core/setup/class_setupStep_Ldap.inc b/gosa-core/setup/class_setupStep_Ldap.inc
index eca54c38a..cf0370712 100644
--- a/gosa-core/setup/class_setupStep_Ldap.inc
+++ b/gosa-core/setup/class_setupStep_Ldap.inc
@@ -42,6 +42,7 @@ class Step_Ldap extends setup_step
 
   var $header_image= "images/setup/ldap.png";
 
+    var $b_displayCheckbutton = TRUE;
   function Step_Ldap()
   {
     $this->update_strings();
diff --git a/gosa-core/setup/class_setupStep_Migrate.inc b/gosa-core/setup/class_setupStep_Migrate.inc
index a761be093..e352b10bd 100644
--- a/gosa-core/setup/class_setupStep_Migrate.inc
+++ b/gosa-core/setup/class_setupStep_Migrate.inc
@@ -39,6 +39,7 @@ class Step_Migrate extends setup_step
     /* Root object classes */
     var $rootOC_migrate_dialog = FALSE;
     var $rootOC_details = array();
+    var $b_displayCheckbutton = TRUE;
 
     function Step_Migrate()
     {
@@ -507,7 +508,7 @@ class Step_Migrate extends setup_step
     function execute()
     {
         /* Initialise checks if this is the first call */
-        if(!$this->checks_initialised || isset($_POST['reload'])){
+        if(!$this->checks_initialised || isset($_POST['test'])){
             $this->initialize_checks();
             $this->checks_initialised = TRUE;
         }
diff --git a/gosa-core/setup/setup_migrate.tpl b/gosa-core/setup/setup_migrate.tpl
index 9f17d8ffe..0ef474f15 100644
--- a/gosa-core/setup/setup_migrate.tpl
+++ b/gosa-core/setup/setup_migrate.tpl
@@ -16,8 +16,6 @@
                 </tr>
             {/foreach}
         </table>
-		<br>
-		<button type='submit' name='reload'>{t}Check again{/t}</button>
 
 	{elseif $method == "rootOC_migrate_dialog"}