From: Marcin Haba <marcin.haba@bacula.pl>
Date: Wed, 10 Nov 2021 04:09:32 +0000 (+0100)
Subject: baculum: Add copy resource function to enable creating new resources based on others
X-Git-Tag: Release-11.3.2~132
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9d45ed519417eeb4fb018f7809676218dffade00;p=thirdparty%2Fbacula.git

baculum: Add copy resource function to enable creating new resources based on others
---

diff --git a/gui/baculum/protected/Web/Lang/en/messages.mo b/gui/baculum/protected/Web/Lang/en/messages.mo
index 48ac65606..dd33943e8 100644
Binary files a/gui/baculum/protected/Web/Lang/en/messages.mo and b/gui/baculum/protected/Web/Lang/en/messages.mo differ
diff --git a/gui/baculum/protected/Web/Lang/en/messages.po b/gui/baculum/protected/Web/Lang/en/messages.po
index 9184c2e8e..124faafb3 100644
--- a/gui/baculum/protected/Web/Lang/en/messages.po
+++ b/gui/baculum/protected/Web/Lang/en/messages.po
@@ -3886,3 +3886,6 @@ msgstr "Enable Bacula messages log window:"
 
 msgid "The messages log window enables to review Bacula logs in one place available from almost every part on the interface. To collect logs is used the bconsole 'messages' command. The messages log window is displayed after clicking on the envelope icon at the top right side of the interface. This function is enabled by default. If enabled, it is available only for users with the Administrator role assigned."
 msgstr "The messages log window enables to review Bacula logs in one place available from almost every part on the interface. To collect logs is used the bconsole 'messages' command. The messages log window is displayed after clicking on the envelope icon at the top right side of the interface. This function is enabled by default. If enabled, it is available only for users with the Administrator role assigned."
+
+msgid "Copy configuration from:"
+msgstr "Copy configuration from:"
diff --git a/gui/baculum/protected/Web/Lang/ja/messages.mo b/gui/baculum/protected/Web/Lang/ja/messages.mo
index b8ef5cd3c..795eb2373 100644
Binary files a/gui/baculum/protected/Web/Lang/ja/messages.mo and b/gui/baculum/protected/Web/Lang/ja/messages.mo differ
diff --git a/gui/baculum/protected/Web/Lang/ja/messages.po b/gui/baculum/protected/Web/Lang/ja/messages.po
index c591bcf48..e1cb0abb0 100644
--- a/gui/baculum/protected/Web/Lang/ja/messages.po
+++ b/gui/baculum/protected/Web/Lang/ja/messages.po
@@ -3972,3 +3972,6 @@ msgstr "Enable Bacula messages log window:"
 
 msgid "The messages log window enables to review Bacula logs in one place available from almost every part on the interface. To collect logs is used the bconsole 'messages' command. The messages log window is displayed after clicking on the envelope icon at the top right side of the interface. This function is enabled by default. If enabled, it is available only for users with the Administrator role assigned."
 msgstr "The messages log window enables to review Bacula logs in one place available from almost every part on the interface. To collect logs is used the bconsole 'messages' command. The messages log window is displayed after clicking on the envelope icon at the top right side of the interface. This function is enabled by default. If enabled, it is available only for users with the Administrator role assigned."
+
+msgid "Copy configuration from:"
+msgstr "Copy configuration from:"
diff --git a/gui/baculum/protected/Web/Lang/pl/messages.mo b/gui/baculum/protected/Web/Lang/pl/messages.mo
index a81a1f97a..e7a190612 100644
Binary files a/gui/baculum/protected/Web/Lang/pl/messages.mo and b/gui/baculum/protected/Web/Lang/pl/messages.mo differ
diff --git a/gui/baculum/protected/Web/Lang/pl/messages.po b/gui/baculum/protected/Web/Lang/pl/messages.po
index fd4429486..40711ae0d 100644
--- a/gui/baculum/protected/Web/Lang/pl/messages.po
+++ b/gui/baculum/protected/Web/Lang/pl/messages.po
@@ -3896,3 +3896,6 @@ msgstr "Enable Bacula messages log window:"
 
 msgid "The messages log window enables to review Bacula logs in one place available from almost every part on the interface. To collect logs is used the bconsole 'messages' command. The messages log window is displayed after clicking on the envelope icon at the top right side of the interface. This function is enabled by default. If enabled, it is available only for users with the Administrator role assigned."
 msgstr "The messages log window enables to review Bacula logs in one place available from almost every part on the interface. To collect logs is used the bconsole 'messages' command. The messages log window is displayed after clicking on the envelope icon at the top right side of the interface. This function is enabled by default. If enabled, it is available only for users with the Administrator role assigned."
+
+msgid "Copy configuration from:"
+msgstr "Copy configuration from:"
diff --git a/gui/baculum/protected/Web/Lang/pt/messages.mo b/gui/baculum/protected/Web/Lang/pt/messages.mo
index 3e6dc2610..3f9bef231 100644
Binary files a/gui/baculum/protected/Web/Lang/pt/messages.mo and b/gui/baculum/protected/Web/Lang/pt/messages.mo differ
diff --git a/gui/baculum/protected/Web/Lang/pt/messages.po b/gui/baculum/protected/Web/Lang/pt/messages.po
index f9f98bda9..f35c06402 100644
--- a/gui/baculum/protected/Web/Lang/pt/messages.po
+++ b/gui/baculum/protected/Web/Lang/pt/messages.po
@@ -3897,3 +3897,6 @@ msgstr "Enable Bacula messages log window:"
 
 msgid "The messages log window enables to review Bacula logs in one place available from almost every part on the interface. To collect logs is used the bconsole 'messages' command. The messages log window is displayed after clicking on the envelope icon at the top right side of the interface. This function is enabled by default. If enabled, it is available only for users with the Administrator role assigned."
 msgstr "The messages log window enables to review Bacula logs in one place available from almost every part on the interface. To collect logs is used the bconsole 'messages' command. The messages log window is displayed after clicking on the envelope icon at the top right side of the interface. This function is enabled by default. If enabled, it is available only for users with the Administrator role assigned."
+
+msgid "Copy configuration from:"
+msgstr "Copy configuration from:"
diff --git a/gui/baculum/protected/Web/Lang/ru/messages.mo b/gui/baculum/protected/Web/Lang/ru/messages.mo
index 1eba14ae5..c78b95026 100644
Binary files a/gui/baculum/protected/Web/Lang/ru/messages.mo and b/gui/baculum/protected/Web/Lang/ru/messages.mo differ
diff --git a/gui/baculum/protected/Web/Lang/ru/messages.po b/gui/baculum/protected/Web/Lang/ru/messages.po
index 4f68bea31..c94092edf 100644
--- a/gui/baculum/protected/Web/Lang/ru/messages.po
+++ b/gui/baculum/protected/Web/Lang/ru/messages.po
@@ -3897,3 +3897,6 @@ msgstr "Enable Bacula messages log window:"
 
 msgid "The messages log window enables to review Bacula logs in one place available from almost every part on the interface. To collect logs is used the bconsole 'messages' command. The messages log window is displayed after clicking on the envelope icon at the top right side of the interface. This function is enabled by default. If enabled, it is available only for users with the Administrator role assigned."
 msgstr "The messages log window enables to review Bacula logs in one place available from almost every part on the interface. To collect logs is used the bconsole 'messages' command. The messages log window is displayed after clicking on the envelope icon at the top right side of the interface. This function is enabled by default. If enabled, it is available only for users with the Administrator role assigned."
+
+msgid "Copy configuration from:"
+msgstr "Copy configuration from:"
diff --git a/gui/baculum/protected/Web/Pages/NewResource.page b/gui/baculum/protected/Web/Pages/NewResource.page
index 7d91ce4c1..40b3e9b26 100644
--- a/gui/baculum/protected/Web/Pages/NewResource.page
+++ b/gui/baculum/protected/Web/Pages/NewResource.page
@@ -7,9 +7,18 @@
 		</h5>
 	</header>
 	<div>
-		<button type="button" class="w3-button w3-green w3-margin-left w3-margin-bottom" onclick="document.getElementById('new_resource').style.display = 'block'">
+		<button type="button" class="w3-button w3-green w3-margin-left w3-margin-bottom w3-margin-right w3-show-inline-block" onclick="document.getElementById('new_resource').style.display = 'block'">
 			<i class="fa fa-plus"></i> &nbsp;<%=Prado::localize('Add new resource')%>
 		</button>
+		<span style="vertical-align: super"><%[ Copy configuration from: ]%></span>
+		<div class="directive_field w3-show-inline-block w3-margin-bottom" style="vertical-align: middle">
+			<com:TActiveDropDownList
+				ID="ResourcesToCopy"
+				CssClass="w3-select w3-border w3-show-inline-block"
+				Style="min-width: 300px"
+				OnSelectedIndexChanged="copyConfig"
+			/>
+		</div>
 		<div id="resource_save_ok_box" class="w3-modal" style="display: none">
 			<div class="w3-modal-content w3-card-4 w3-animate-zoom" style="width: 600px">
 				<header class="w3-container w3-green">
diff --git a/gui/baculum/protected/Web/Pages/NewResource.php b/gui/baculum/protected/Web/Pages/NewResource.php
index af33052d2..54eb8c314 100644
--- a/gui/baculum/protected/Web/Pages/NewResource.php
+++ b/gui/baculum/protected/Web/Pages/NewResource.php
@@ -44,6 +44,14 @@ class NewResource extends BaculumWebPage {
 		if ($this->IsCallBack || $this->IsPostBack) {
 			return;
 		}
+		if (key_exists('HTTP_REFERER', $_SERVER)) {
+			$this->setOriginUrl($_SERVER['HTTP_REFERER']);
+		}
+		$this->setConfigForm();
+		$this->loadResourcesToCopy();
+	}
+
+	private function setConfigForm($resource_name = null) {
 		$component_type = null;
 		$component_name = null;
 		$resource_type = null;
@@ -65,12 +73,45 @@ class NewResource extends BaculumWebPage {
 			$this->NewResource->setComponentType($component_type);
 			$this->NewResource->setComponentName($component_name);
 			$this->NewResource->setResourceType($resource_type);
-			$this->NewResource->setLoadValues(false);
+			if (is_string($resource_name)) {
+				$this->NewResource->setResourceName($resource_name);
+				$this->NewResource->setLoadValues(true);
+				$this->NewResource->setCopyMode(true);
+			} else {
+				$this->NewResource->setLoadValues(false);
+				$this->NewResource->setCopyMode(false);
+			}
 			$this->NewResource->raiseEvent('OnDirectiveListLoad', $this, null);
 			$this->setHosts();
 		}
-		if (key_exists('HTTP_REFERER', $_SERVER)) {
-			$this->setOriginUrl($_SERVER['HTTP_REFERER']);
+	}
+
+	private function loadResourcesToCopy() {
+		if ($this->Request->contains('component_type') && $this->Request->contains('resource_type')) {
+			$component_type = $this->Request['component_type'];
+			$resource_type = $this->Request['resource_type'];
+			$resources = ['' => ''];
+			$params = [
+				'config',
+				$component_type,
+				$resource_type
+			];
+			$res = $this->getModule('api')->get($params);
+			if ($res->error === 0) {
+				for ($i = 0; $i < count($res->output); $i++) {
+					$r = $res->output[$i]->{$resource_type}->Name;
+					$resources[$r] = $r;
+				}
+			}
+			$this->ResourcesToCopy->DataSource = $resources;
+			$this->ResourcesToCopy->dataBind();
+		}
+	}
+
+	public function copyConfig($sender, $param) {
+		$resource_name = $this->ResourcesToCopy->SelectedValue;
+		if (!empty($resource_name)) {
+			$this->setConfigForm($resource_name);
 		}
 	}
 
diff --git a/gui/baculum/protected/Web/Portlets/BaculaConfigDirectives.php b/gui/baculum/protected/Web/Portlets/BaculaConfigDirectives.php
index 1892ef703..3e98b4361 100644
--- a/gui/baculum/protected/Web/Portlets/BaculaConfigDirectives.php
+++ b/gui/baculum/protected/Web/Portlets/BaculaConfigDirectives.php
@@ -111,6 +111,10 @@ class BaculaConfigDirectives extends DirectiveListTemplate {
 			// This control is loaded only once, otherwise fields loose assigned values.
 			return;
 		}
+		$copy_mode = $this->getCopyMode();
+		if ($copy_mode) {
+			$this->setShowAllDirectives(true);
+		}
 
 		$host = $this->getHost();
 		$component_type = $this->getComponentType();
@@ -250,6 +254,12 @@ class BaculaConfigDirectives extends DirectiveListTemplate {
 		$this->RepeaterDirectives->dataBind();
 		$this->ConfigDirectives->Display = 'Dynamic';
 		$this->IsDirectiveCreated = true;
+		if ($copy_mode) {
+			$this->getPage()->getCallbackClient()->callClientFunction(
+				'oBaculaConfigSection.show_sections',
+				[true]
+			);
+		}
 	}
 
 	public function loadDirectives($sender, $param) {
@@ -364,7 +374,7 @@ class BaculaConfigDirectives extends DirectiveListTemplate {
 			// In some cases with double control load Name value stays empty. Recreate it here.
 			$directives['Name'] = $res_name_dir = $resource_name;
 		}
-		if ($load_values === true) {
+		if ($load_values === true && $this->getCopyMode() === false) {
 			if ($resource_name !== $res_name_dir) {
 				// RENAME RESOURCE
 				if ($this->renameResource($res_name_dir)) {
diff --git a/gui/baculum/protected/Web/Portlets/BaculaConfigDirectives.tpl b/gui/baculum/protected/Web/Portlets/BaculaConfigDirectives.tpl
index f54ee41f5..0675d7425 100644
--- a/gui/baculum/protected/Web/Portlets/BaculaConfigDirectives.tpl
+++ b/gui/baculum/protected/Web/Portlets/BaculaConfigDirectives.tpl
@@ -42,7 +42,7 @@
 			ID="DirectiveSetting"
 			Resource="<%=$this->getResource()%>"
 			OnLoadDirectives="loadDirectives"
-			Visible="<%=$this->LoadValues%>"
+			Visible="<%=$this->LoadValues && !$this->CopyMode%>"
 		/>
 		<com:TActiveLinkButton
 			CssClass="w3-button w3-red w3-right"
@@ -71,7 +71,7 @@
 			CommandParameter="save"
 		>
 			<prop:Text>
-				<i class="fa fa-save"></i> &nbsp;<%=$this->getLoadValues() ? Prado::localize('Save') : Prado::localize('Create')%>
+				<i class="fa fa-save"></i> &nbsp;<%=$this->getLoadValues() && !$this->getCopyMode() ? Prado::localize('Save') : Prado::localize('Create')%>
 			</prop:Text>
 			<prop:ClientSide.OnLoading>
 				$('.save_progress').css({'visibility': '', 'display': 'inline-block'});
diff --git a/gui/baculum/protected/Web/Portlets/BaculaConfigResourceList.php b/gui/baculum/protected/Web/Portlets/BaculaConfigResourceList.php
index d75e62211..2f5be191e 100644
--- a/gui/baculum/protected/Web/Portlets/BaculaConfigResourceList.php
+++ b/gui/baculum/protected/Web/Portlets/BaculaConfigResourceList.php
@@ -106,10 +106,13 @@ class BaculaConfigResourceList extends Portlets {
 
 	public function loadResourceWindow($sender, $param) {
 		list($cmd, $name) = $param->getCallbackParameter();
+		$copy_el_id = 'resource_window_copy_resource' . $this->ClientID;
 		if (!empty($name)) {
 			// edit existing resource
 			$this->ResourceConfig->setResourceName($name);
 			$this->ResourceConfig->setLoadValues(true);
+			$this->ResourceConfig->setCopyMode(false);
+			$this->getPage()->getCallbackClient()->hide($copy_el_id);
 		} else {
 			// add new resource
 			$this->ResourceConfig->setLoadValues(false);
@@ -117,6 +120,8 @@ class BaculaConfigResourceList extends Portlets {
 				'oBaculaConfigSection.show_sections',
 				[true]
 			);
+			$this->loadResourcesToCopy();
+			$this->getPage()->getCallbackClient()->show($copy_el_id);
 		}
 		$host = $this->getHost();
 		$component_type = $this->getComponentType();
@@ -134,6 +139,37 @@ class BaculaConfigResourceList extends Portlets {
 		$this->ResourceConfig->unloadDirectives();
 	}
 
+	private function loadResourcesToCopy() {
+		$component_type = $this->getComponentType();
+		$resource_type = $this->getResourceType();
+		$resources = ['' => ''];
+		$params = [
+			'config',
+			$component_type,
+			$resource_type
+		];
+		$res = $this->getModule('api')->get($params);
+		if ($res->error === 0) {
+			for ($i = 0; $i < count($res->output); $i++) {
+				$r = $res->output[$i]->{$resource_type}->Name;
+				$resources[$r] = $r;
+			}
+		}
+		$this->ResourcesToCopy->DataSource = $resources;
+		$this->ResourcesToCopy->dataBind();
+	}
+
+	public function copyConfig($sender, $param) {
+		$resource_name = $this->ResourcesToCopy->SelectedValue;
+		if (!empty($resource_name)) {
+			$this->ResourceConfig->setResourceName($resource_name);
+			$this->ResourceConfig->setLoadValues(true);
+			$this->ResourceConfig->setCopyMode(true);
+			$this->ResourceConfig->raiseEvent('OnDirectiveListLoad', $this, null);
+		}
+	}
+
+
 	public function removeResource($sender, $param) {
 		$host = $this->getHost();
 		$component_type = $this->getComponentType();
diff --git a/gui/baculum/protected/Web/Portlets/BaculaConfigResourceList.tpl b/gui/baculum/protected/Web/Portlets/BaculaConfigResourceList.tpl
index 94dc6b0bc..6d03245d7 100644
--- a/gui/baculum/protected/Web/Portlets/BaculaConfigResourceList.tpl
+++ b/gui/baculum/protected/Web/Portlets/BaculaConfigResourceList.tpl
@@ -133,6 +133,17 @@ var oBaculaConfigResourceList<%=$this->ClientID%> = {
 			<h2 id="resource_window_title_add<%=$this->ClientID%>" style="display: none"><%[ Add ]%> <com:TActiveLabel ID="ResourceTypeAddWindowTitle" /></h2>
 			<h2 id="resource_window_title_edit<%=$this->ClientID%>" style="display: none"><%[ Edit ]%> <com:TActiveLabel ID="ResourceTypeEditWindowTitle" /></h2>
 		</header>
+		<div id="resource_window_copy_resource<%=$this->ClientID%>"class="w3-container w3-margin-left w3-margin-right w3-margin-top w3-right" style="display: none">
+			<span style="vertical-align: super"><%[ Copy configuration from: ]%></span>
+			<div class="directive_field w3-show-inline-block w3-margin-bottom" style="vertical-align: middle">
+				<com:TActiveDropDownList
+					ID="ResourcesToCopy"
+					CssClass="w3-select w3-border w3-show-inline-block"
+					Style="min-width: 300px"
+					OnSelectedIndexChanged="copyConfig"
+				/>
+			</div>
+		</div>
 		<div class="w3-container w3-margin-left w3-margin-right w3-margin-top">
 			<com:Application.Web.Portlets.BaculaConfigDirectives
 				ID="ResourceConfig"
diff --git a/gui/baculum/protected/Web/Portlets/DirectiveListTemplate.php b/gui/baculum/protected/Web/Portlets/DirectiveListTemplate.php
index 45c72e0f6..1d1332cc9 100644
--- a/gui/baculum/protected/Web/Portlets/DirectiveListTemplate.php
+++ b/gui/baculum/protected/Web/Portlets/DirectiveListTemplate.php
@@ -46,6 +46,7 @@ class DirectiveListTemplate extends ConfigListTemplate implements IActiveControl
 	const PARENT_NAME = 'ParentName';
 	const GROUP_NAME = 'GroupName';
 	const IS_DIRECTIVE_CREATED = 'IsDirectiveCreated';
+	const COPY_MODE = 'CopyMode';
 
 	public $doc;
 
@@ -198,6 +199,15 @@ class DirectiveListTemplate extends ConfigListTemplate implements IActiveControl
 		$this->setViewState(self::IS_DIRECTIVE_CREATED, $is_created);
 	}
 
+	public function getCopyMode() {
+		return $this->getViewState(self::COPY_MODE, false);
+	}
+
+	public function setCopyMode($copy_mode) {
+		$copy_mode = TPropertyValue::ensureBoolean($copy_mode);
+		$this->setViewState(self::COPY_MODE, $copy_mode, false);
+	}
+
 	public function setDoc() {
 		$component_type = $this->getComponentType();
 		$resource_type = $this->getResourceType();