From f4e228636b98113e9c65e426ce394eca9698dafc Mon Sep 17 00:00:00 2001
From: Marcin Haba <marcin.haba@bacula.pl>
Date: Sat, 9 May 2020 23:29:23 +0200
Subject: [PATCH] baculum: Fix validators in run job modal window

---
 gui/baculum/protected/Web/Portlets/RunJob.php |  4 +-
 gui/baculum/protected/Web/Portlets/RunJob.tpl | 71 ++++++++++++++-----
 2 files changed, 54 insertions(+), 21 deletions(-)

diff --git a/gui/baculum/protected/Web/Portlets/RunJob.php b/gui/baculum/protected/Web/Portlets/RunJob.php
index 18891cf8a..3bff836da 100644
--- a/gui/baculum/protected/Web/Portlets/RunJob.php
+++ b/gui/baculum/protected/Web/Portlets/RunJob.php
@@ -3,7 +3,7 @@
  * Bacula(R) - The Network Backup Solution
  * Baculum   - Bacula web interface
  *
- * Copyright (C) 2013-2019 Kern Sibbald
+ * Copyright (C) 2013-2020 Kern Sibbald
  *
  * The main author of Baculum is Marcin Haba.
  * The original author of Bacula is Kern Sibbald, with contributions
@@ -27,7 +27,7 @@ Prado::using('System.Web.UI.ActiveControls.TActiveCustomValidator');
 Prado::using('System.Web.UI.ActiveControls.TActiveCheckBox');
 Prado::using('System.Web.UI.ActiveControls.TCallback');
 Prado::using('System.Web.UI.ActiveControls.TActiveLabel');
-Prado::using('System.Web.UI.ActiveControls.TActiveButton');
+Prado::using('System.Web.UI.ActiveControls.TActiveLinkButton');
 Prado::using('Application.Web.Portlets.Portlets');
 
 /**
diff --git a/gui/baculum/protected/Web/Portlets/RunJob.tpl b/gui/baculum/protected/Web/Portlets/RunJob.tpl
index 809b5bb4b..0c930a272 100644
--- a/gui/baculum/protected/Web/Portlets/RunJob.tpl
+++ b/gui/baculum/protected/Web/Portlets/RunJob.tpl
@@ -5,13 +5,6 @@
 			<h2><%[ Run job ]%><%=$this->getJobName() ? ' - ' . $this->getJobName() : ''%></h2>
 		</header>
 		<div class="w3-container w3-margin-left w3-margin-right">
-			<com:TValidationSummary
-				ID="ValidationSummary"
-				CssClass="validation-error-summary"
-				ValidationGroup="JobGroup"
-				AutoUpdate="true"
-				Display="Dynamic"
-				/>
 			<com:TActivePanel ID="JobToRunLine" CssClass="w3-row w3-section w3-text-teal" Display="None">
 				<div class="w3-col w3-third"><i class="w3-xxlarge fa fa-tasks"></i> &nbsp;<com:TLabel ForControl="JobToRun" Text="<%[ Job to run: ]%>" CssClass="w3-xlarge" /></div>
 				<div class="w3-half">
@@ -86,7 +79,32 @@
 				<div class="w3-col w3-third"><i class="w3-xxlarge fa fa-file-alt"></i> &nbsp;<com:TLabel ForControl="JobToVerifyJobId" Text="<%[ JobId to Verify: ]%>" CssClass="w3-xlarge" /></div>
 				<div class="w3-half">
 					<com:TActiveTextBox ID="JobToVerifyJobId" CssClass="w3-input w3-border" AutoPostBack="false" />
-					<com:TDataTypeValidator ID="JobToVerifyJobIdValidator" ValidationGroup="JobGroup" ControlToValidate="JobToVerifyJobId" ErrorMessage="<%[ JobId to Verify value must be integer greather than 0. ]%>" ControlCssClass="validation-error" Display="None" DataType="Integer" />
+					<com:TRequiredFieldValidator
+						ValidationGroup="JobGroup"
+						ControlToValidate="JobToVerifyJobId"
+						ErrorMessage="<%[ JobId to Verify value must be integer greather than 0. ]%>"
+						ControlCssClass="validation-error"
+						Display="Dynamic"
+					>
+						<prop:ClientSide.OnValidate>
+							var verify_opts = document.getElementById('<%=$this->JobToVerifyOptions->ClientID%>');
+							sender.enabled = (verify_opts.value === 'jobid');
+						</prop:ClientSide.OnValidate>
+					</com:TRequiredFieldValidator>
+					<com:TDataTypeValidator
+						ID="JobToVerifyJobIdValidator"
+						ValidationGroup="JobGroup"
+						ControlToValidate="JobToVerifyJobId"
+						ErrorMessage="<%[ JobId to Verify value must be integer greather than 0. ]%>"
+						ControlCssClass="validation-error"
+						Display="Dynamic"
+						DataType="Integer"
+					>
+						<prop:ClientSide.OnValidate>
+							var verify_opts = document.getElementById('<%=$this->JobToVerifyOptions->ClientID%>');
+							sender.enabled = (verify_opts.value === 'jobid');
+						</prop:ClientSide.OnValidate>
+					</com:TDataTypeValidator>
 				</div>
 			</com:TActivePanel>
 			<div class="w3-row w3-section w3-text-teal">
@@ -120,7 +138,22 @@
 				<div class="w3-col w3-third"><i class="w3-xxlarge fa fa-sort-numeric-up"></i> &nbsp;<com:TLabel ForControl="Priority" Text="<%[ Priority: ]%>" CssClass="w3-xlarge" /></div>
 				<div class="w3-half">
 					<com:TActiveTextBox ID="Priority" CssClass="w3-input w3-border" AutoPostBack="false" />
-					<com:TDataTypeValidator ID="PriorityValidator" ValidationGroup="JobGroup" ControlToValidate="Priority" ErrorMessage="<%[ Priority value must be integer greather than 0. ]%>" ControlCssClass="validation-error" Display="None" DataType="Integer" />
+					<com:TRequiredFieldValidator
+						ValidationGroup="JobGroup"
+						ControlToValidate="Priority"
+						ErrorMessage="<%[ Priority value must be integer greather than 0. ]%>"
+						ControlCssClass="validation-error"
+						Display="Dynamic"
+					/>
+					<com:TDataTypeValidator
+						ID="PriorityValidator"
+						ValidationGroup="JobGroup"
+						ControlToValidate="Priority"
+						ErrorMessage="<%[ Priority value must be integer greather than 0. ]%>"
+						ControlCssClass="validation-error"
+						Display="Dynamic"
+						DataType="Integer"
+					/>
 				</div>
 			</div>
 			<com:TActivePanel ID="AccurateLine" CssClass="w3-row w3-section w3-text-teal">
@@ -142,12 +175,16 @@
 			</div>
 		</div>
 		<footer class="w3-container w3-center">
-			<com:TActiveButton
+			<com:TActiveLinkButton
 				ID="Estimate"
 				Text="<%[ Estimate job ]%>"
 				OnClick="estimate"
 				CssClass="w3-button w3-section w3-teal w3-padding"
 			>
+				<prop:Attributes.onclick>
+					var mainForm = Prado.Validation.getForm();
+					return Prado.Validation.validate(mainForm, 'JobGroup');
+				</prop:Attributes.onclick>
 				<prop:ClientSide.OnLoading>
 					document.getElementById('status_command_loading').style.visibility = 'visible';
 				</prop:ClientSide.OnLoading>
@@ -157,8 +194,8 @@
 					show_job_log(true);
 					scroll_down_job_log();
 				</prop:ClientSide.OnComplete>
-			</com:TActiveButton>
-			<com:TActiveButton
+			</com:TActiveLinkButton>
+			<com:TActiveLinkButton
 				ID="Run"
 				Text="<%[ Run job ]%>"
 				ValidationGroup="JobGroup"
@@ -168,17 +205,13 @@
 			>
 				<prop:Attributes.onclick>
 					var mainForm = Prado.Validation.getForm();
-					var send = false;
-					if (Prado.Validation.managers[mainForm].getValidatorsWithError('JobGroup').length == 0) {
-						send = true;
-					}
-					return send;
+					return Prado.Validation.validate(mainForm, 'JobGroup');
 				</prop:Attributes.onclick>
-			</com:TActiveButton>
+			</com:TActiveLinkButton>
 			<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>
-- 
2.47.3