From: Marcin Haba <marcin.haba@bacula.pl>
Date: Sun, 10 Oct 2021 09:42:04 +0000 (+0200)
Subject: baculum: Add capability to use pre-defined paths in API config wizard - idea proposed... 
X-Git-Tag: Release-11.0.6~71
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0b712b7119f5ab7a5b616a678176a6ad70548ff4;p=thirdparty%2Fbacula.git

baculum: Add capability to use pre-defined paths in API config wizard - idea proposed by Heitor Faria
---

diff --git a/gui/baculum/protected/API/Lang/en/messages.mo b/gui/baculum/protected/API/Lang/en/messages.mo
index 5dd6c0269..d00e4cca8 100644
Binary files a/gui/baculum/protected/API/Lang/en/messages.mo and b/gui/baculum/protected/API/Lang/en/messages.mo differ
diff --git a/gui/baculum/protected/API/Lang/en/messages.po b/gui/baculum/protected/API/Lang/en/messages.po
index a4c21f978..a001c3226 100644
--- a/gui/baculum/protected/API/Lang/en/messages.po
+++ b/gui/baculum/protected/API/Lang/en/messages.po
@@ -674,3 +674,14 @@ msgstr "No data available in table"
 msgid "Search:"
 msgstr "Search:"
 
+msgid "Get pre-defined paths:"
+msgstr "Get pre-defined paths:"
+
+msgid "Select paths"
+msgstr "Select paths"
+
+msgid "Binaries:"
+msgstr "Binaries:"
+
+msgid "Configs:"
+msgstr "Configs:"
diff --git a/gui/baculum/protected/API/Lang/pl/messages.mo b/gui/baculum/protected/API/Lang/pl/messages.mo
index 2d4d6ca5c..b1faff572 100644
Binary files a/gui/baculum/protected/API/Lang/pl/messages.mo and b/gui/baculum/protected/API/Lang/pl/messages.mo differ
diff --git a/gui/baculum/protected/API/Lang/pl/messages.po b/gui/baculum/protected/API/Lang/pl/messages.po
index c38d3bbe5..cc7c55fc0 100644
--- a/gui/baculum/protected/API/Lang/pl/messages.po
+++ b/gui/baculum/protected/API/Lang/pl/messages.po
@@ -679,3 +679,15 @@ msgstr "Brak dostępnych danych w tabeli"
 
 msgid "Search:"
 msgstr "Szukaj:"
+
+msgid "Get pre-defined paths:"
+msgstr "Użyj pre-definiowanych lokalizacji:"
+
+msgid "Select paths"
+msgstr "Wybierz lokalizacje"
+
+msgid "Binaries:"
+msgstr "Pliki bin.:"
+
+msgid "Configs:"
+msgstr "Pliki konfig.:"
diff --git a/gui/baculum/protected/API/Lang/pt/messages.mo b/gui/baculum/protected/API/Lang/pt/messages.mo
index 65086cdd6..18b69420a 100644
Binary files a/gui/baculum/protected/API/Lang/pt/messages.mo and b/gui/baculum/protected/API/Lang/pt/messages.mo differ
diff --git a/gui/baculum/protected/API/Lang/pt/messages.po b/gui/baculum/protected/API/Lang/pt/messages.po
index 597e83f77..9cf0157c5 100644
--- a/gui/baculum/protected/API/Lang/pt/messages.po
+++ b/gui/baculum/protected/API/Lang/pt/messages.po
@@ -680,3 +680,14 @@ msgstr "Não há dados disponíveis na tabela"
 msgid "Search:"
 msgstr "Procurar:"
 
+msgid "Get pre-defined paths:"
+msgstr "Get pre-defined paths:"
+
+msgid "Select paths"
+msgstr "Select paths"
+
+msgid "Binaries:"
+msgstr "Binaries:"
+
+msgid "Configs:"
+msgstr "Configs:"
diff --git a/gui/baculum/protected/API/Lang/ru/messages.mo b/gui/baculum/protected/API/Lang/ru/messages.mo
index ba54a47eb..35791f239 100644
Binary files a/gui/baculum/protected/API/Lang/ru/messages.mo and b/gui/baculum/protected/API/Lang/ru/messages.mo differ
diff --git a/gui/baculum/protected/API/Lang/ru/messages.po b/gui/baculum/protected/API/Lang/ru/messages.po
index c7dd8e58e..c3861bf55 100644
--- a/gui/baculum/protected/API/Lang/ru/messages.po
+++ b/gui/baculum/protected/API/Lang/ru/messages.po
@@ -680,3 +680,14 @@ msgstr "Нет данных в таблице"
 msgid "Search:"
 msgstr "Поиск:"
 
+msgid "Get pre-defined paths:"
+msgstr "Get pre-defined paths:"
+
+msgid "Select paths"
+msgstr "Select paths"
+
+msgid "Binaries:"
+msgstr "Binaries:"
+
+msgid "Configs:"
+msgstr "Configs:"
diff --git a/gui/baculum/protected/API/Pages/Panel/APIInstallWizard.page b/gui/baculum/protected/API/Pages/Panel/APIInstallWizard.page
index 42968affa..8f140a782 100644
--- a/gui/baculum/protected/API/Pages/Panel/APIInstallWizard.page
+++ b/gui/baculum/protected/API/Pages/Panel/APIInstallWizard.page
@@ -473,6 +473,14 @@
 				/> <com:TLabel ForControl="ConfigYes" Text="<%[ Yes ]%>" />
 			</div>
 			<div id="configure_config" style="display: <%=($this->ConfigYes->Checked === true) ? 'block' : 'none';%>">
+				<div class="w3-right-align">
+					<span><%[ Get pre-defined paths: ]%></span>
+					<select id="pre_defined_paths" onchange="oConfigWizardStep4.set_paths();" class="w3-input w3-border" style="width: 400px; display: inline;">
+						<option value=""><%[ Select paths ]%></option>
+						<option value="system"><%[ Binaries: ]%> /usr/sbin, <%[ Configs: ]%> /etc/bacula</option>
+						<option value="bacula.org"><%[ Binaries: ]%> /opt/bacula/bin, <%[ Configs: ]%> /opt/bacula/etc</option>
+					</select>
+				</div>
 				<fieldset>
 					<legend><%[ General configuration ]%></legend>
 					<div class="w3-row w3-section" title="<%[ In this directory Baculum API saves temporarily Bacula configuration files (mainly for validation purposes) just before they are written as real Bacula configuration files. ]%>">
@@ -821,6 +829,67 @@
 					</com:TActiveLinkButton>
 				</div>
 			</div>
+<script>
+var oConfigWizardStep4 = {
+	paths: {
+		'system': {
+			configs: '/etc/bacula/',
+			binaries: '/usr/sbin/'
+		},
+		'bacula.org': {
+			configs: '/opt/bacula/etc/',
+			binaries: '/opt/bacula/bin/'
+		}
+	},
+	ids: {
+		pre_defined_paths: 'pre_defined_paths',
+		jsontools: {
+			bdirjson: {
+				binary: '<%=$this->BDirJSONPath->ClientID%>',
+				config: '<%=$this->DirCfgPath->ClientID%>'
+			},
+			bsdjson: {
+				binary: '<%=$this->BSdJSONPath->ClientID%>',
+				config: '<%=$this->SdCfgPath->ClientID%>'
+			},
+			bfdjson: {
+				binary: '<%=$this->BFdJSONPath->ClientID%>',
+				config: '<%=$this->FdCfgPath->ClientID%>'
+			},
+			bbconsjson: {
+				binary: '<%=$this->BBconsJSONPath->ClientID%>',
+				config: '<%=$this->BconsCfgPath->ClientID%>'
+			}
+		}
+	},
+	configs: {
+		bdirjson: {
+			config: 'bacula-dir.conf'
+		},
+		bsdjson: {
+			config: 'bacula-sd.conf'
+		},
+		bfdjson: {
+			config: 'bacula-fd.conf'
+		},
+		bbconsjson: {
+			config: 'bconsole.conf'
+		}
+	},
+	set_paths: function() {
+		var paths = document.getElementById(this.ids.pre_defined_paths);
+		if (paths.value) {
+			var bin, conf;
+			for (var binary in this.ids.jsontools) {
+				bin = document.getElementById(this.ids.jsontools[binary].binary);
+				conf = document.getElementById(this.ids.jsontools[binary].config);
+				bin.value = this.paths[paths.value].binaries + binary;
+				conf.value = this.paths[paths.value].configs + this.configs[binary].config;
+			}
+		}
+	}
+};
+</script>
 		</com:TWizardStep>
 		<com:TWizardStep ID="Step5" Title="<%[ Step 5 - authentication to API ]%>" StepType="Auto">
 			<div class="w3-container w3-section">