From: Marcin Haba <marcin.haba@bacula.pl>
Date: Fri, 10 Aug 2018 04:45:50 +0000 (+0200)
Subject: baculum: Tweak fix status modules naming to avoid conflicts
X-Git-Tag: Release-9.2.1~9
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=78acc48465d6f3a5c1527e24ef8d8f81313491a2;p=thirdparty%2Fbacula.git

baculum: Tweak fix status modules naming to avoid conflicts
---

diff --git a/gui/baculum/protected/API/Class/DirectorStatus.php b/gui/baculum/protected/API/Class/StatusDirector.php
similarity index 97%
rename from gui/baculum/protected/API/Class/DirectorStatus.php
rename to gui/baculum/protected/API/Class/StatusDirector.php
index b205b0156..b931b16e7 100644
--- a/gui/baculum/protected/API/Class/DirectorStatus.php
+++ b/gui/baculum/protected/API/Class/StatusDirector.php
@@ -25,7 +25,7 @@ Prado::using('Application.API.Class.ComponentStatusModule');
 /**
  * Module used to parse and prepare director status output.
  */
-class DirectorStatus extends ComponentStatusModule {
+class StatusDirector extends ComponentStatusModule {
 
 	/**
 	 * Get director status by raw bconsole status director output.
diff --git a/gui/baculum/protected/API/Class/StorageStatus.php b/gui/baculum/protected/API/Class/StatusStorage.php
similarity index 97%
rename from gui/baculum/protected/API/Class/StorageStatus.php
rename to gui/baculum/protected/API/Class/StatusStorage.php
index 4bc9c01a0..d3b7580e1 100644
--- a/gui/baculum/protected/API/Class/StorageStatus.php
+++ b/gui/baculum/protected/API/Class/StatusStorage.php
@@ -25,7 +25,7 @@ Prado::using('Application.API.Class.ComponentStatusModule');
 /**
  * Module used to parse and prepare storage status output.
  */
-class StorageStatus extends ComponentStatusModule {
+class StatusStorage extends ComponentStatusModule {
 
 	/**
 	 * Get director status by raw bconsole status director output.
diff --git a/gui/baculum/protected/API/Pages/config.xml b/gui/baculum/protected/API/Pages/config.xml
index a28dc64aa..ceb6547d5 100644
--- a/gui/baculum/protected/API/Pages/config.xml
+++ b/gui/baculum/protected/API/Pages/config.xml
@@ -36,7 +36,7 @@
 		<module id="oauth2_authid" class="Application.API.Class.OAuth2.AuthIdManager" />
 		<module id="oauth2_token" class="Application.API.Class.OAuth2.TokenManager" />
 		<!-- component status modules -->
-		<module id="status_dir" class="Application.API.Class.DirectorStatus" />
-		<module id="status_sd" class="Application.API.Class.StorageStatus" />
+		<module id="status_dir" class="Application.API.Class.StatusDirector" />
+		<module id="status_sd" class="Application.API.Class.StatusStorage" />
 	</modules>
 </configuration>