[prev in list] [next in list] [prev in thread] [next in thread] 

List:       bacula-commits
Subject:    [Bacula-commits] [bacula.org] Bacula Community source git repository branch Branch-9.0 updated.
From:       git () bacula ! org (Kern Sibbald)
Date:       2017-07-15 15:38:31
Message-ID: 20170715153831.C31916A1A8A () bacula ! bacula ! org
[Download RAW message or body]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Bacula Community source git repository".

The branch, Branch-9.0 has been updated
       via  2cdf525ffb803a547e31e4776d2c3b84d8896807 (commit)
       via  8afa22fd9e5bdbca0e7be01b916929a7767a3677 (commit)
       via  1f23fef84093b80f14663546146a83156fb367c3 (commit)
      from  c6c0135cc1a88851cb98f77e522390f6952db3b6 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 2cdf525ffb803a547e31e4776d2c3b84d8896807
Author: Kern Sibbald <kern@sibbald.com>
Date:   Sat Jul 15 17:37:23 2017 +0200

    Tweak update time/date

commit 8afa22fd9e5bdbca0e7be01b916929a7767a3677
Author: Marcin Haba <marcin.haba@bacula.pl>
Date:   Fri Jul 14 19:47:24 2017 +0200

    baculum: Fix multiple directors support

commit 1f23fef84093b80f14663546146a83156fb367c3
Author: Marcin Haba <marcin.haba@bacula.pl>
Date:   Fri Jul 14 19:26:13 2017 +0200

    baculum: Fix showing errors from the API

-----------------------------------------------------------------------

Summary of changes:
diff --git a/bacula/src/dird/bdirjson.c b/bacula/src/dird/bdirjson.c
index f44f77e..948d1e8 100644
--- a/bacula/src/dird/bdirjson.c
+++ b/bacula/src/dird/bdirjson.c
@@ -760,6 +760,7 @@ static void display_run(HPKT &hpkt)
                      sendit(NULL, "      \"%s\": \"%s\"", RunFields[i].name,
                         joblevels[j].level_name);
                      first = false;
+                     break;
                   }
                }
             //}
diff --git a/bacula/src/version.h b/bacula/src/version.h
index 8f0af46..eb7f319 100644
--- a/bacula/src/version.h
+++ b/bacula/src/version.h
@@ -5,9 +5,9 @@
 #define COMMUNITY 1      /* Define to create a Windows community binary */
 
 /* Note: there can be only *one* VERSION in this file */
-#define VERSION "9.0.1"
-#define BDATE   "12 July 2017"
-#define LSMDATE "12Jul17"
+#define VERSION "9.0.2"
+#define BDATE   "15 July 2017"
+#define LSMDATE "15Jul17"
 
 #define RELEASE 1   /* Use ONLY in rpms */
 
diff --git a/gui/baculum/protected/Web/Class/BaculumAPIClient.php \
b/gui/baculum/protected/Web/Class/BaculumAPIClient.php index f8cb849..d918aa1 100644
--- a/gui/baculum/protected/Web/Class/BaculumAPIClient.php
+++ b/gui/baculum/protected/Web/Class/BaculumAPIClient.php
@@ -50,7 +50,7 @@ class BaculumAPIClient extends WebModule {
 	 *
 	 * @access private
 	 */
-	private $session_params = array();
+	private $session_params = array('director');
 
 	/**
 	 * Host params to do API requests.
diff --git a/gui/baculum/protected/Web/Pages/BaculumError.page \
b/gui/baculum/protected/Web/Pages/BaculumError.page index b2b4d72..f9acc52 100644
--- 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 b65a473..8f047c4 100644
--- 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']);
 	}
 }
 ?>


hooks/post-receive
-- 
Bacula Community source git repository

------------------------------------------------------------------------------
Check out the vibrant tech community on one of the world's most
engaging tech sites, Slashdot.org! http://sdm.link/slashdot
_______________________________________________
Bacula-commits mailing list
Bacula-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/bacula-commits


[prev in list] [next in list] [prev in thread] [next in thread]