From: Marcin Haba <marcin.haba@bacula.pl>
Date: Sun, 11 Aug 2019 05:22:52 +0000 (+0200)
Subject: baculum: Fix running job twice when job is running by run job window
X-Git-Tag: Release-9.6.0~145
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=63da60f91416bea2057d362f32aae114ca5b3f3d;p=thirdparty%2Fbacula.git

baculum: Fix running job twice when job is running by run job window
---

diff --git a/gui/baculum/protected/Web/Portlets/RunJob.php b/gui/baculum/protected/Web/Portlets/RunJob.php
index 94ef64c76..6a2740b87 100644
--- a/gui/baculum/protected/Web/Portlets/RunJob.php
+++ b/gui/baculum/protected/Web/Portlets/RunJob.php
@@ -315,9 +315,9 @@ class RunJob extends Portlets {
 
 		if ($result->error === 0) {
 			$this->getPage()->getCallbackClient()->callClientFunction('set_loading_status', array('loading'));
-			$this->EstimationLog->Text = implode($result->output);
+			$this->RunJobLog->Text = implode('', $result->output);
 		} else {
-			$this->EstimationLog->Text = $result->output;
+			$this->RunJobLog->Text = $result->output;
 		}
 	}
 
@@ -334,7 +334,7 @@ class RunJob extends Portlets {
 
 		if ($result->error === 0) {
 			if (count($result->output) > 0) {
-				$this->EstimationLog->Text = implode($result->output);
+				$this->RunJobLog->Text = implode('', $result->output);
 				$this->getPage()->getCallbackClient()->callClientFunction(
 					'estimate_output_refresh',
 					array($out_id)
@@ -346,7 +346,7 @@ class RunJob extends Portlets {
 				);
 			}
 		} else {
-			$this->EstimationLog->Text = $result->output;
+			$this->RunJobLog->Text = $result->output;
 		}
 	}
 	public function runJobAgain($sender, $param) {
@@ -367,7 +367,7 @@ class RunJob extends Portlets {
 		$params['priority'] = $this->Priority->Text;
 		$params['accurate'] = (integer)$this->Accurate->Checked;
 
-		if (in_array($this->Level->SelectedItem->Value, $this->job_to_verify)) {
+		if (!empty($this->Level->SelectedItem) && in_array($this->Level->SelectedItem->Value, $this->job_to_verify)) {
 			$verifyVals = $this->getVerifyVals();
 			if ($this->JobToVerifyOptions->SelectedItem->Value == $verifyVals['jobname']) {
 				$params['verifyjob'] = $this->JobToVerifyJobName->SelectedValue;
@@ -375,10 +375,18 @@ class RunJob extends Portlets {
 				$params['jobid'] = $this->JobToVerifyJobId->Text;
 			}
 		}
-		$result = $this->getModule('api')->create(array('jobs', 'run'), $params)->output;
-		$started_jobid = $this->getModule('misc')->findJobIdStartedJob($result);
-		if (is_numeric($started_jobid)) {
-			$this->getPage()->goToPage('JobHistoryView', array('jobid' => $started_jobid));
+		$result = $this->getModule('api')->create(array('jobs', 'run'), $params);
+		if ($result->error === 0) {
+			$started_jobid = $this->getModule('misc')->findJobIdStartedJob($result->output);
+			if (is_numeric($started_jobid)) {
+				$this->getPage()->getCallbackClient()->callClientFunction('run_job_go_to_running_job', $started_jobid);
+			} else {
+				$this->RunJobLog->Text = implode('', $result->output);
+				$this->getPage()->getCallbackClient()->callClientFunction('show_job_log', true);
+			}
+		} else {
+			$this->RunJobLog->Text = $result->output;
+			$this->getPage()->getCallbackClient()->callClientFunction('show_job_log', true);
 		}
 	}
 }
diff --git a/gui/baculum/protected/Web/Portlets/RunJob.tpl b/gui/baculum/protected/Web/Portlets/RunJob.tpl
index 0f8ac62a4..0a2ea966e 100644
--- a/gui/baculum/protected/Web/Portlets/RunJob.tpl
+++ b/gui/baculum/protected/Web/Portlets/RunJob.tpl
@@ -131,7 +131,7 @@
 		</div>
 		<div id="run_job_log" class="w3-panel w3-card w3-light-grey" style="display: none; max-height: 200px; overflow-x: auto;">
 			<div class="w3-code notranslate">
-				<pre><com:TActiveLabel ID="EstimationLog" /></pre>
+				<pre><com:TActiveLabel ID="RunJobLog" /></pre>
 			</div>
 		</div>
 		<footer class="w3-container w3-center">
@@ -147,12 +147,11 @@
 				<prop:ClientSide.OnComplete>
 					$('#status_update_slots_loading').css('visibility', 'hidden');
 					document.getElementById('status_command_loading').style.visibility = 'hidden';
-					document.getElementById('run_job_log').style.display = '';
-					var logbox = document.getElementById('run_job_log');
-					logbox.scrollTo(0, logbox.scrollHeight);
+					show_job_log(true);
+					scroll_down_job_log();
 				</prop:ClientSide.OnComplete>
 			</com:TActiveButton>
-			<com:TButton
+			<com:TActiveButton
 				ID="Run"
 				Text="<%[ Run job ]%>"
 				ValidationGroup="JobGroup"
@@ -168,7 +167,12 @@
 					}
 					return send;
 				</prop:Attributes.onclick>
-			</com:TButton>
+			</com:TActiveButton>
+			<script>
+				var run_job_go_to_running_job = function(jobid) {
+					document.location.href = '/web/job/history/' + jobid + '/';
+				}
+			</script>
 			<i id="status_command_loading" class="fa fa-sync w3-spin" style="visibility: hidden;"></i>
 		</footer>
 	</div>
@@ -178,30 +182,43 @@
 >
 	<prop:ClientSide.OnLoading>
 		$('#status_command_loading').css('visibility', 'visible');
-		var logbox = document.getElementById('run_job_log');
-		if ((logbox.offsetHeight + logbox.scrollTop) === logbox.scrollHeight) {
-			command_logbox_scroll = true;
+		var joblog = document.getElementById('run_job_log');
+		if ((joblog.offsetHeight + joblog.scrollTop) === joblog.scrollHeight) {
+			command_joblog_scroll = true;
 		} else {
-			command_logbox_scroll = false;
+			command_joblog_scroll = false;
 		}
 	</prop:ClientSide.OnLoading>
 	<prop:ClientSide.OnComplete>
 		$('#status_command_loading').css('visibility', 'hidden');
-		if (command_logbox_scroll) {
-			var logbox = document.getElementById('run_job_log');
-			logbox.scrollTo(0, logbox.scrollHeight);
+		if (command_joblog_scroll) {
+			scroll_down_job_log();
 		}
 	</prop:ClientSide.OnComplete>
 </com:TCallback>
 <script type="text/javascript">
-var command_logbox_scroll = false;
+var command_joblog_scroll = false;
 function close_run_job_window() {
 	document.getElementById('run_job').style.display = 'none';
-	var joblog = document.getElementById('<%=$this->EstimationLog->ClientID%>');
-	joblog.innerHTML = '';
-	joblog.style.display = 'none';
+	show_job_log(false);
+	set_job_log('');
 	set_loading_status('start');
 }
+function set_job_log(log) {
+	document.getElementById('<%=$this->RunJobLog->ClientID%>').textContent = log;
+}
+function show_job_log(show) {
+	var joblog = document.getElementById('run_job_log');
+	if (show === true) {
+		joblog.style.display = '';
+	} else {
+		joblog.style.display = 'none';
+	}
+}
+function scroll_down_job_log() {
+	var joblog = document.getElementById('run_job_log');
+	joblog.scrollTo(0, joblog.scrollHeight);
+}
 function set_loading_status(status) {
 	var start = document.getElementById('command_status_start');
 	var loading = document.getElementById('command_status_loading');