baculum: Fix showing errors from the API

diff --git a/gui/baculum/protected/Web/Pages/BaculumError.page b/gui/baculum/protected/Web/Pages/BaculumError.page
index b2b4d728ade1911e2d369a55f2acafb67d890065..f9acc52af8e35efeb9fb36905f07de5cb9282cc0 100644 (file)
--- a/gui/baculum/protected/Web/Pages/BaculumError.page
+++ b/gui/baculum/protected/Web/Pages/BaculumError.page
@@ -2,10 +2,8 @@
 <com:TContent ID="Message">
  <div id="message-box">
        <h2><%[ Baculum problem ]%></h2>
-       <com:TPanel Visible="<%=$this->error != 2 && $this->error != 4 && $this->error != 6%>">
-               <h3>Error <%=$this->error%> - <%=$this->output%></h3>
-               <hr />
-       </com:TPanel>
+       <h3>Error <%=$this->error%> - <%=$this->output%></h3>
+       <hr />
        <p class="center">
                <a href="<%=$this->Service->constructUrl('WebHome')%>"><%[ TRY AGAIN ]%></a> <%[ or run ]%>
                <a href="<%=$this->Service->constructUrl('WebConfigWizard')%>"><%[ Baculum Initial Wizard ]%></a>

diff --git a/gui/baculum/protected/Web/Pages/BaculumError.php b/gui/baculum/protected/Web/Pages/BaculumError.php
index b65a473ec3c1ad5d9692acbca11924ce8e832dba..8f047c4cec5b05aaf97e2ef5be33f430af02e65c 100644 (file)
--- a/gui/baculum/protected/Web/Pages/BaculumError.php
+++ b/gui/baculum/protected/Web/Pages/BaculumError.php
@@ -23,12 +23,13 @@
 Prado::using('Application.Web.Class.BaculumWebPage');
 
 class BaculumError extends BaculumWebPage {
+
        public $error;
        public $output;
 
        public function onInit($param) {
                $this->error = intval($this->Request['error']);
-               $this->output = $this->Request['output'];
+               $this->output = urldecode($this->Request['output']);
        }
 }
 ?>