From: Marcin Haba <marcin.haba@bacula.pl>
Date: Wed, 4 Dec 2019 23:46:56 +0000 (+0100)
Subject: baculum: Improve showing create new resource messages
X-Git-Tag: Release-9.6.0~47
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=35f4eeb0204c253cfdf4e3fb0df6815deb56a121;p=thirdparty%2Fbacula.git

baculum: Improve showing create new resource messages

Go back to previous page after confirming new resource message
---

diff --git a/gui/baculum/protected/Web/Lang/en/messages.mo b/gui/baculum/protected/Web/Lang/en/messages.mo
index 6ed8a35f31..916d3f1bb8 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 2014807408..f78bc5b363 100644
--- a/gui/baculum/protected/Web/Lang/en/messages.po
+++ b/gui/baculum/protected/Web/Lang/en/messages.po
@@ -2518,3 +2518,9 @@ msgstr "Enable restore from copy jobs feature:"
 
 msgid "Note: if you select incremental or differential backup, on the next step will be also loaded all directories and files from older backups required to do the job restore. In other words, the selected backup determines time point from which will be loaded the selected backup and other older backups (incremental, differential) backups up till closest full backup."
 msgstr "Note: if you select incremental or differential backup, on the next step will be also loaded all directories and files from older backups required to do the job restore. In other words, the selected backup determines time point from which will be loaded the selected backup and other older backups (incremental, differential) backups up till closest full backup."
+
+msgid "Create new resource"
+msgstr "Create new resource"
+
+msgid "The resource has been created successfully."
+msgstr "The resource has been created successfully."
diff --git a/gui/baculum/protected/Web/Lang/ja/messages.mo b/gui/baculum/protected/Web/Lang/ja/messages.mo
index deafb7a03f..c09a299fb9 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 fa7a6323f5..9de7ea6a95 100644
--- a/gui/baculum/protected/Web/Lang/ja/messages.po
+++ b/gui/baculum/protected/Web/Lang/ja/messages.po
@@ -2604,3 +2604,9 @@ msgstr "Enable restore from copy jobs feature:"
 
 msgid "Note: if you select incremental or differential backup, on the next step will be also loaded all directories and files from older backups required to do the job restore. In other words, the selected backup determines time point from which will be loaded the selected backup and other older backups (incremental, differential) backups up till closest full backup."
 msgstr "Note: if you select incremental or differential backup, on the next step will be also loaded all directories and files from older backups required to do the job restore. In other words, the selected backup determines time point from which will be loaded the selected backup and other older backups (incremental, differential) backups up till closest full backup."
+
+msgid "Create new resource"
+msgstr "Create new resource"
+
+msgid "The resource has been created successfully."
+msgstr "The resource has been created successfully."
diff --git a/gui/baculum/protected/Web/Lang/pl/messages.mo b/gui/baculum/protected/Web/Lang/pl/messages.mo
index ac535cddb9..25767c1e88 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 14744bc9f7..4dbe093ae3 100644
--- a/gui/baculum/protected/Web/Lang/pl/messages.po
+++ b/gui/baculum/protected/Web/Lang/pl/messages.po
@@ -2525,3 +2525,9 @@ msgstr "Włącz funkcję przywracania danych z kopii zadań:"
 
 msgid "Note: if you select incremental or differential backup, on the next step will be also loaded all directories and files from older backups required to do the job restore. In other words, the selected backup determines time point from which will be loaded the selected backup and other older backups (incremental, differential) backups up till closest full backup."
 msgstr "Uwaga: jeśli wybierzesz kopię przyrostową lub różnicową, w następnym kroku będą również załadowane wszystkie pliki i katalogi ze starszych kopii wymaganych do przywrócenia zadania. Innymi słowy, wybrana kopia zapasowa określa punkt czasowy z którego będzie załadowana wybrana kopia i inne starsze kopie (przyrostowe, różnicowe) aż do najbliższej kopii pełnej."
+
+msgid "Create new resource"
+msgstr "Tworzenie nowego zasobu"
+
+msgid "The resource has been created successfully."
+msgstr "Zasób został utworzony pomyślnie."
diff --git a/gui/baculum/protected/Web/Lang/pt/messages.mo b/gui/baculum/protected/Web/Lang/pt/messages.mo
index 9c413734b7..6e5c93f431 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 711282ab09..8e0d62e88f 100644
--- a/gui/baculum/protected/Web/Lang/pt/messages.po
+++ b/gui/baculum/protected/Web/Lang/pt/messages.po
@@ -2533,3 +2533,9 @@ msgstr "Enable restore from copy jobs feature:"
 
 msgid "Note: if you select incremental or differential backup, on the next step will be also loaded all directories and files from older backups required to do the job restore. In other words, the selected backup determines time point from which will be loaded the selected backup and other older backups (incremental, differential) backups up till closest full backup."
 msgstr "Note: if you select incremental or differential backup, on the next step will be also loaded all directories and files from older backups required to do the job restore. In other words, the selected backup determines time point from which will be loaded the selected backup and other older backups (incremental, differential) backups up till closest full backup."
+
+msgid "Create new resource"
+msgstr "Create new resource"
+
+msgid "The resource has been created successfully."
+msgstr "The resource has been created successfully."
diff --git a/gui/baculum/protected/Web/Pages/NewJobWizard.page b/gui/baculum/protected/Web/Pages/NewJobWizard.page
index cc778dace4..fcb352dee3 100644
--- a/gui/baculum/protected/Web/Pages/NewJobWizard.page
+++ b/gui/baculum/protected/Web/Pages/NewJobWizard.page
@@ -191,7 +191,7 @@
 			</div>
 			<div id="fileset_save_ok" class="w3-panel w3-green w3-display-container" style="display: none">
 				<span onclick="this.parentElement.style.display='none'" class="w3-button w3-green w3-large w3-display-topright">x</span>
-				<p><%[ Resource has been saved successfully. ]%></p>
+				<p><%[ The resource has been created successfully. ]%></p>
 			</div>
 			<div id="job_wizard_new_fileset" class="w3-card-4 w3-padding w3-margin-top" style="display: none">
 				<h3><%[ New FileSet ]%></h3>
@@ -268,7 +268,7 @@
 			</div>
 			<div id="pool_save_ok" class="w3-panel w3-green w3-display-container" style="display: none">
 				<span onclick="this.parentElement.style.display='none'" class="w3-button w3-green w3-large w3-display-topright">x</span>
-				<p><%[ Resource has been saved successfully. ]%></p>
+				<p><%[ The resource has been created successfully. ]%></p>
 			</div>
 			<div id="job_wizard_new_pool" class="w3-card-4 w3-padding w3-margin-top" style="display: none">
 				<h3><%[ New Pool ]%></h3>
@@ -393,7 +393,7 @@
 			</div>
 			<div id="schedule_save_ok" class="w3-panel w3-green w3-display-container" style="display: none">
 				<span onclick="this.parentElement.style.display='none'" class="w3-button w3-green w3-large w3-display-topright">x</span>
-				<p><%[ Resource has been saved successfully. ]%></p>
+				<p><%[ The resource has been created successfully. ]%></p>
 			</div>
 			<div id="job_wizard_new_schedule" class="w3-card-4 w3-padding w3-margin-top" style="display: none">
 				<h3><%[ New Schedule ]%></h3>
diff --git a/gui/baculum/protected/Web/Pages/NewResource.page b/gui/baculum/protected/Web/Pages/NewResource.page
index ff7f6a20c1..b60d38ae23 100644
--- a/gui/baculum/protected/Web/Pages/NewResource.page
+++ b/gui/baculum/protected/Web/Pages/NewResource.page
@@ -9,9 +9,19 @@
 	<button type="button" class="w3-button w3-green w3-margin-left w3-margin-bottom" onclick="document.getElementById('new_resource').style.display = 'block'">
 		<i class="fa fa-plus"></i> &nbsp;<%=Prado::localize('Add new resource')%>
 	</button>
-	<div id="resource_save_ok" class="w3-panel w3-green w3-display-container" style="display: none">
-		<span onclick="this.parentElement.style.display='none'" class="w3-button w3-green w3-large w3-display-topright">x</span>
-		<p><%[ Resource has been saved successfully. ]%></p>
+	<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">
+				<span onclick="$('#resource_save_ok_box').hide();" class="w3-button w3-display-topright">×</span>
+				<h2><%[ Create new resource ]%></h2>
+			</header>
+			<div class="w3-panel w3-padding">
+				<p><%[ The resource has been created successfully. ]%></p>
+			</div>
+			<footer class="w3-container w3-center w3-border-top">
+				<button type="button" class="w3-button w3-section w3-green" onclick="$('#resource_save_ok_box').hide(); save_directive_post_action();"><i class="fa fa-check"></i> &nbsp;<%[ OK ]%></button>
+			</footer>
+		</div>
 	</div>
 	<div id="new_resource" class="w3-modal">
 		<div class="w3-modal-content w3-animate-top w3-card-4 w3-padding">
@@ -89,12 +99,22 @@
 	<div id="resource_config" class="w3-container">
 		<com:Application.Web.Portlets.BaculaConfigDirectives
 			ID="NewResource"
-			SaveDirectiveActionOk="$('#resource_config').slideUp(); $('#resource_save_ok').show();"
+			SaveDirectiveActionOk="save_directive_action_ok();"
 			ShowRemoveButton="false"
 			ShowCancelButton="false"
 		/>
 	</div>
 	<script>
+		function save_directive_action_ok() {
+			$('#resource_config').slideUp();
+			$('#resource_save_ok_box').show();
+		}
+		function save_directive_post_action() {
+			var origin_url = '<%=$this->getOriginUrl()%>';
+			if (origin_url) {
+				document.location.href = origin_url;
+			}
+		}
 		oBaculaConfigSection.show_sections(true);
 	</script>
 </com:TContent>
diff --git a/gui/baculum/protected/Web/Pages/NewResource.php b/gui/baculum/protected/Web/Pages/NewResource.php
index 679efa134e..bf9151393f 100644
--- a/gui/baculum/protected/Web/Pages/NewResource.php
+++ b/gui/baculum/protected/Web/Pages/NewResource.php
@@ -30,6 +30,7 @@ class NewResource extends BaculumWebPage {
 	const COMPONENT_TYPE = 'ComponentType';
 	const COMPONENT_NAME = 'ComponentName';
 	const RESOURCE_TYPE = 'ResourceType';
+	const ORIGIN_URL = 'OriginUrl';
 
 	public function onPreRender($param) {
 		parent::onPreRender($param);
@@ -63,6 +64,9 @@ class NewResource extends BaculumWebPage {
 			$this->NewResource->raiseEvent('OnDirectiveListLoad', $this, null);
 			$this->setHosts();
 		}
+		if (key_exists('HTTP_REFERER', $_SERVER)) {
+			$this->setOriginUrl($_SERVER['HTTP_REFERER']);
+		}
 	}
 
 	public function setHosts() {
@@ -183,6 +187,14 @@ class NewResource extends BaculumWebPage {
 		$this->setViewState(self::RESOURCE_TYPE, $type);
 	}
 
+	public function getOriginUrl() {
+		return $this->getViewState(self::ORIGIN_URL);
+	}
+
+	public function setOriginUrl($url) {
+		$this->setViewState(self::ORIGIN_URL, $url);
+	}
+
 	public function createResource() {
 		if ($this->Host->SelectedIndex > 0 && $this->Component->SelectedIndex > 0 && $this->Resource->SelectedValue) {
 			$host = $this->Host->SelectedValue;
diff --git a/gui/baculum/protected/Web/Portlets/BaculaConfigComponents.tpl b/gui/baculum/protected/Web/Portlets/BaculaConfigComponents.tpl
index 81678206a7..2bf3db7384 100644
--- a/gui/baculum/protected/Web/Portlets/BaculaConfigComponents.tpl
+++ b/gui/baculum/protected/Web/Portlets/BaculaConfigComponents.tpl
@@ -29,9 +29,29 @@
 		</prop:ItemTemplate>
 	</com:TActiveRepeater>
 </div>
-	<com:TActiveLabel ID="ErrorMsg" Display="None" />
+<com:TActiveLabel ID="ErrorMsg" Display="None" />
 <div class="config_directives new_resource" rel="<%=$this->getHost()%>new_resource" style="display: none">
+	<!-- New resource -->
 	<h2 rel="<%[ Add new %resource_type resource on %component_name (%component_type) ]%>"></h2>
 	<hr />
-	<com:Application.Web.Portlets.BaculaConfigDirectives ID="NewResource" LoadValues="<%=false%>" />
+	<com:Application.Web.Portlets.BaculaConfigDirectives
+		ID="NewResource"
+		LoadValues="<%=false%>"
+		SaveDirectiveActionOk="$('#<%=$this->ResourceCreatedOk->ClientID%>').show();"
+	/>
 </div>
+<!-- Resource created successfully - confirm -->
+<com:TPanel ID="ResourceCreatedOk" CssClass="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">
+			<span onclick="$('#<%=$this->ResourceCreatedOk->ClientID%>').hide();" class="w3-button w3-display-topright">×</span>
+			<h2><%[ Create new resource ]%></h2>
+		</header>
+		<div class="w3-panel w3-padding">
+			<p><%[ The resource has been created successfully. ]%></p>
+		</div>
+		<footer class="w3-container w3-center w3-border-top">
+			<button type="button" class="w3-button w3-section w3-green" onclick="$('#<%=$this->ResourceCreatedOk->ClientID%>').hide(); $('#<%=$this->NewResource->Cancel->ClientID%>').click();"><i class="fa fa-check"></i> &nbsp;<%[ OK ]%></button>
+		</footer>
+	</div>
+</com:TPanel>