From: Marcin Haba <marcin.haba@bacula.pl>
Date: Fri, 1 Jan 2016 11:04:12 +0000 (+0100)
Subject: baculum: Fix showing bconsole test result in configuration wizard
X-Git-Tag: Release-7.4.0~50
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=eb8335eb307f02a0a93524794f3f0792b7af930e;p=bacula%2Fbacula

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 d16191e577..496058e238 100644
--- 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 b0ca6c48e5..c070e703b0 100644
--- 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 d9a4e498ba..f541cbeec2 100644
--- 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);
 	}
 }
 ?>