baculum: Fix showing bconsole test result in configuration wizard

diff --git a/gui/baculum/protected/Class/Bconsole.php b/gui/baculum/protected/Class/Bconsole.php
index d16191e577563be1ae5a13ddea7a76729927555f..496058e238a872580a78f4d4b94e4a1215cbaae5 100644 (file)
--- a/gui/baculum/protected/Class/Bconsole.php
+++ b/gui/baculum/protected/Class/Bconsole.php
@@ -138,7 +138,8 @@ class Bconsole extends TModule {
        public function testBconsoleCommand(array $command, $bconsoleCmdPath, $bconsoleCfgPath, $useSudo) {
                $this->setEnvironmentParams($bconsoleCmdPath, $bconsoleCfgPath, null, $useSudo);
                $director = array_shift($this->getDirectors()->output);
-               return $this->bconsoleCommand($director, $command);             
+               $result = $this->bconsoleCommand($director, $command);
+               return $result;
        }
 }
 ?>

diff --git a/gui/baculum/protected/Pages/ConfigurationWizard.page b/gui/baculum/protected/Pages/ConfigurationWizard.page
index b0ca6c48e5f62e8f69d8bdf992f8bb77d0316e84..c070e703b02afb92ea9e1e897c8d40d4cda56610 100644 (file)
--- a/gui/baculum/protected/Pages/ConfigurationWizard.page
+++ b/gui/baculum/protected/Pages/ConfigurationWizard.page
@@ -157,7 +157,6 @@
                        </com:TActivePanel>
                </com:TWizardStep>
                <com:TWizardStep ID="Step4" Title="<%[ Step 4 - Baculum access to bconsole ]%>" StepType="Auto">
-                       <com:TActivePanel ID="Step4Content">
                                <div class="line">
                                        <div class="text"><com:TLabel ForControl="BconsolePath" Text="<%[ Bconsole binary file path: ]%>" /></div>
                                        <div class="field">
@@ -197,8 +196,8 @@
                                                                </td>
                                                                <td align="center" valign="middle">
                                                                        <com:TActiveLabel ID="BconsoleTestLoader" Display="None"><img src="<%=$this->getTheme()->getBaseUrl()%>/ajax-loader.gif" alt="<%[ Loading... ]%>" /></com:TActiveLabel>
-                                                                       <com:TActiveLabel ID="BconsoleTestResultOk" Display="None" CssClass="validate"><img src="<%=$this->getTheme()->getBaseUrl()%>/icon_ok.png" alt="Validate" /> <%[ OK ]%></com:TActiveLabel>
-                                                                       <com:TActiveLabel ID="BconsoleTestResultErr" Display="None" CssClass="validator-block"><img src="<%=$this->getTheme()->getBaseUrl()%>/icon_err.png" alt="Invalidate" /> <%[ Connection error ]%></com:TActiveLabel>
+                                                                       <com:TActiveLabel ID="BconsoleTestResultOk" Display="None" CssClass="validate" EnableViewState="false"><img src="<%=$this->getTheme()->getBaseUrl()%>/icon_ok.png" alt="Validate" /> <%[ OK ]%></com:TActiveLabel>
+                                                                       <com:TActiveLabel ID="BconsoleTestResultErr" Display="None" CssClass="validator-block" EnableViewState="false"><img src="<%=$this->getTheme()->getBaseUrl()%>/icon_err.png" alt="Invalidate" /> <%[ Connection error ]%></com:TActiveLabel>
                                                                </td>
                                                        </tr>
                                                </table>
@@ -224,7 +223,6 @@
                                <div class="line">
                                        <p><b><%[ NOTE! ]%></b><br /><%[ {user} keyword will be replaced for each logged user into according username. ]%></p>
                                </div>
-                       </com:TActivePanel>
                </com:TWizardStep>
                <com:TWizardStep ID="Step5" Title="<%[ Step 5 - authorization params to Baculum ]%>" StepType="Auto">
                        <div class="line">

diff --git a/gui/baculum/protected/Pages/ConfigurationWizard.php b/gui/baculum/protected/Pages/ConfigurationWizard.php
index d9a4e498badbf9bbee5f320a666cbabbd847b568..f541cbeec221ea127d56bee09bc19f4522d84b4f 100644 (file)
--- a/gui/baculum/protected/Pages/ConfigurationWizard.php
+++ b/gui/baculum/protected/Pages/ConfigurationWizard.php
@@ -229,7 +229,6 @@ class ConfigurationWizard extends BaculumPage
                $isValidate = ($result === 0);
                $this->BconsoleTestResultOk->Display = ($isValidate === true) ? 'Dynamic' : 'None';
                $this->BconsoleTestResultErr->Display = ($isValidate === false) ? 'Dynamic' : 'None';
-               $this->Step4Content->render($param->NewWriter);
        }
 }
 ?>