From: Marcin Haba <marcin.haba@bacula.pl>
Date: Tue, 13 Jul 2021 02:51:33 +0000 (+0200)
Subject: baculum: Add to directive controls option to hide reset button and remove button
X-Git-Tag: Release-11.3.2~183
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=98d6c50708895155732611108e1ee9d42e5f8025;p=thirdparty%2Fbacula.git

baculum: Add to directive controls option to hide reset button and remove button
---

diff --git a/gui/baculum/protected/Web/Portlets/DirectiveCheckBox.tpl b/gui/baculum/protected/Web/Portlets/DirectiveCheckBox.tpl
index dd124839b..a599283d9 100644
--- a/gui/baculum/protected/Web/Portlets/DirectiveCheckBox.tpl
+++ b/gui/baculum/protected/Web/Portlets/DirectiveCheckBox.tpl
@@ -9,6 +9,6 @@
 			OnCheckedChanged="saveValue"
 			ActiveControl.EnableUpdate="false"
 		/>
-		<i class="fa fa-undo reset_btn" onclick="document.getElementById('<%=$this->Directive->ClientID%>').checked = <%=$this->getDefaultValue() ? 'true' : 'false'%>;" alt="<%[ Reset to default value ]%>" title="<%[ Reset to default value ]%>"></i>
+		<i class="fa fa-undo reset_btn<%=!$this->ShowResetButton ? ' hide' : ''%>" onclick="document.getElementById('<%=$this->Directive->ClientID%>').checked = <%=$this->getDefaultValue() ? 'true' : 'false'%>;" alt="<%[ Reset to default value ]%>" title="<%[ Reset to default value ]%>"></i>
 	</div>
 </div>
diff --git a/gui/baculum/protected/Web/Portlets/DirectiveComboBox.tpl b/gui/baculum/protected/Web/Portlets/DirectiveComboBox.tpl
index c6258743a..f6192d185 100644
--- a/gui/baculum/protected/Web/Portlets/DirectiveComboBox.tpl
+++ b/gui/baculum/protected/Web/Portlets/DirectiveComboBox.tpl
@@ -8,8 +8,8 @@
 			AutoPostBack="false"
 			ActiveControl.EnableUpdate="false"
 		/> <%=$this->getRequired() ? '&nbsp;<i class="fa fa-asterisk w3-text-red" style="line-height: 40px"></i>' : ''%>
-		<i class="fa fa-undo reset_btn" onclick="document.getElementById('<%=$this->Directive->ClientID%>').value = '<%=$this->getDefaultValue() === 0 ? '' : $this->getDefaultValue()%>';" alt="<%[ Reset to default value ]%>" title="<%[ Reset to default value ]%>"></i>
-		<i class="fa fa-trash-alt remove_btn" onclick="document.getElementById('<%=$this->Directive->ClientID%>').value = '';" alt="<%[ Remove directive ]%>" title="<%[ Remove directive ]%>"></i>
+		<i class="fa fa-undo reset_btn<%=!$this->ShowResetButton ? ' hide' : ''%>" onclick="document.getElementById('<%=$this->Directive->ClientID%>').value = '<%=$this->getDefaultValue() === 0 ? '' : $this->getDefaultValue()%>';" alt="<%[ Reset to default value ]%>" title="<%[ Reset to default value ]%>"></i>
+		<i class="fa fa-trash-alt remove_btn<%=!$this->ShowRemoveButton ? ' hide' : ''%>" onclick="document.getElementById('<%=$this->Directive->ClientID%>').value = '';" alt="<%[ Remove directive ]%>" title="<%[ Remove directive ]%>"></i>
 		<com:TRequiredFieldValidator
 			ID="DirectiveValidator"
 			ValidationGroup="<%=$this->getValidationGroup()%>"
diff --git a/gui/baculum/protected/Web/Portlets/DirectiveInteger.tpl b/gui/baculum/protected/Web/Portlets/DirectiveInteger.tpl
index d81d0bb27..050e7a94d 100644
--- a/gui/baculum/protected/Web/Portlets/DirectiveInteger.tpl
+++ b/gui/baculum/protected/Web/Portlets/DirectiveInteger.tpl
@@ -8,8 +8,8 @@
 			ActiveControl.EnableUpdate="false"
 			AutoTrim="true"
 		/> <%=$this->getRequired() ? '&nbsp;<i class="fa fa-asterisk w3-text-red" style="line-height: 40px"></i>' : ''%>
-		<i class="fa fa-undo reset_btn" onclick="document.getElementById('<%=$this->Directive->ClientID%>').value = '<%=$this->getDefaultValue() === 0 ? '' : $this->getDefaultValue()%>';" alt="<%[ Reset to default value ]%>" title="<%[ Reset to default value ]%>"></i>
-		<i class="fa fa-trash-alt remove_btn" onclick="document.getElementById('<%=$this->Directive->ClientID%>').value = '';" alt="<%[ Remove directive ]%>" title="<%[ Remove directive ]%>"></i>
+		<i class="fa fa-undo reset_btn<%=!$this->ShowResetButton ? ' hide' : ''%>" onclick="document.getElementById('<%=$this->Directive->ClientID%>').value = '<%=$this->getDefaultValue() === 0 ? '' : $this->getDefaultValue()%>';" alt="<%[ Reset to default value ]%>" title="<%[ Reset to default value ]%>"></i>
+		<i class="fa fa-trash-alt remove_btn<%=!$this->ShowRemoveButton ? ' hide' : ''%>" onclick="document.getElementById('<%=$this->Directive->ClientID%>').value = '';" alt="<%[ Remove directive ]%>" title="<%[ Remove directive ]%>"></i>
 		<com:TRequiredFieldValidator
 			ID="DirectiveValidator"
 			ValidationGroup="<%=$this->getValidationGroup()%>"
diff --git a/gui/baculum/protected/Web/Portlets/DirectiveListBox.tpl b/gui/baculum/protected/Web/Portlets/DirectiveListBox.tpl
index 7e8307d59..d7325b308 100644
--- a/gui/baculum/protected/Web/Portlets/DirectiveListBox.tpl
+++ b/gui/baculum/protected/Web/Portlets/DirectiveListBox.tpl
@@ -9,8 +9,8 @@
 			AutoPostBack="false"
 			ActiveControl.EnableUpdate="false"
 		/> <%=$this->getRequired() ? '&nbsp;<i class="fa fa-asterisk w3-text-red" style="line-height: 40px"></i>' : ''%>
-		<i class="fa fa-undo reset_btn" onclick="document.getElementById('<%=$this->Directive->ClientID%>').value = '<%=$this->getDefaultValue() === 0 ? '' : $this->getDefaultValue()%>';" alt="<%[ Reset to default value ]%>" title="<%[ Reset to default value ]%>"></i>
-		<i class="fa fa-trash-alt remove_btn" onclick="document.getElementById('<%=$this->Directive->ClientID%>').value = '';" alt="<%[ Remove directive ]%>" title="<%[ Remove directive ]%>"></i>
+		<i class="fa fa-undo reset_btn<%=!$this->ShowResetButton ? ' hide' : ''%>" onclick="document.getElementById('<%=$this->Directive->ClientID%>').value = '<%=$this->getDefaultValue() === 0 ? '' : $this->getDefaultValue()%>';" alt="<%[ Reset to default value ]%>" title="<%[ Reset to default value ]%>"></i>
+		<i class="fa fa-trash-alt remove_btn<%=!$this->ShowRemoveButton ? ' hide' : ''%>" onclick="document.getElementById('<%=$this->Directive->ClientID%>').value = '';" alt="<%[ Remove directive ]%>" title="<%[ Remove directive ]%>"></i>
 		<com:TRequiredFieldValidator
 			ID="DirectiveValidator"
 			ValidationGroup="<%=$this->getValidationGroup()%>"
diff --git a/gui/baculum/protected/Web/Portlets/DirectivePassword.tpl b/gui/baculum/protected/Web/Portlets/DirectivePassword.tpl
index 5841566ea..c4cc00a6f 100644
--- a/gui/baculum/protected/Web/Portlets/DirectivePassword.tpl
+++ b/gui/baculum/protected/Web/Portlets/DirectivePassword.tpl
@@ -12,8 +12,8 @@
 		/>
 		 <%=$this->getRequired() ? '&nbsp;<i class="fa fa-asterisk w3-text-red" style="line-height: 40px"></i>' : ''%>
 		<a href="javascript:void(0)" onclick="var el = document.getElementById('<%=$this->Directive->ClientID%>'); el.type = el.type == 'text' ? 'password' : 'text'"><i class="fa fa-eye"></i></a>
-		<i class="fa fa-undo reset_btn" onclick="document.getElementById('<%=$this->Directive->ClientID%>').value = '<%=$this->getDefaultValue() === 0 ? '' : $this->getDefaultValue()%>';" alt="<%[ Reset to default value ]%>" title="<%[ Reset to default value ]%>"></i>
-		<i class="fa fa-trash-alt remove_btn" onclick="document.getElementById('<%=$this->Directive->ClientID%>').value = '';" alt="<%[ Remove directive ]%>" title="<%[ Remove directive ]%>"></i>
+		<i class="fa fa-undo reset_btn<%=!$this->ShowResetButton ? ' hide' : ''%>" onclick="document.getElementById('<%=$this->Directive->ClientID%>').value = '<%=$this->getDefaultValue() === 0 ? '' : $this->getDefaultValue()%>';" alt="<%[ Reset to default value ]%>" title="<%[ Reset to default value ]%>"></i>
+		<i class="fa fa-trash-alt remove_btn<%=!$this->ShowRemoveButton ? ' hide' : ''%>" onclick="document.getElementById('<%=$this->Directive->ClientID%>').value = '';" alt="<%[ Remove directive ]%>" title="<%[ Remove directive ]%>"></i>
 		<com:TRequiredFieldValidator
 			ID="DirectiveValidator"
 			ValidationGroup="<%=$this->getValidationGroup()%>"
diff --git a/gui/baculum/protected/Web/Portlets/DirectiveSize.tpl b/gui/baculum/protected/Web/Portlets/DirectiveSize.tpl
index 695702a04..c60555430 100644
--- a/gui/baculum/protected/Web/Portlets/DirectiveSize.tpl
+++ b/gui/baculum/protected/Web/Portlets/DirectiveSize.tpl
@@ -17,8 +17,8 @@
 			AutoPostBack="false"
 			OnSelectedIndexChanged="saveValue"
 		/> <%=$this->getRequired() ? '&nbsp;<i class="fa fa-asterisk w3-text-red" style="line-height: 40px"></i>' : ''%>
-		<i class="fa fa-undo reset_btn" onclick="var fsize = Units.format_size(parseInt('<%=$this->getDefaultValue()%>', 10), 'B'); document.getElementById('<%=$this->Directive->ClientID%>').value = fsize.value; document.getElementById('<%=$this->SizeFormat->ClientID%>').value = fsize.format;" alt="<%[ Reset to default value ]%>" title="<%[ Reset to default value ]%>"></i>
-		<i class="fa fa-trash-alt remove_btn" onclick="document.getElementById('<%=$this->Directive->ClientID%>').value = '';" alt="<%[ Remove directive ]%>" title="<%[ Remove directive ]%>"></i>
+		<i class="fa fa-undo reset_btn<%=!$this->ShowResetButton ? ' hide' : ''%>" onclick="var fsize = Units.format_size(parseInt('<%=$this->getDefaultValue()%>', 10), 'B'); document.getElementById('<%=$this->Directive->ClientID%>').value = fsize.value; document.getElementById('<%=$this->SizeFormat->ClientID%>').value = fsize.format;" alt="<%[ Reset to default value ]%>" title="<%[ Reset to default value ]%>"></i>
+		<i class="fa fa-trash-alt remove_btn<%=!$this->ShowRemoveButton ? ' hide' : ''%>" onclick="document.getElementById('<%=$this->Directive->ClientID%>').value = '';" alt="<%[ Remove directive ]%>" title="<%[ Remove directive ]%>"></i>
 		<com:TRequiredFieldValidator
 			ID="DirectiveValidator"
 			ValidationGroup="<%=$this->getValidationGroup()%>"
diff --git a/gui/baculum/protected/Web/Portlets/DirectiveSpeed.php b/gui/baculum/protected/Web/Portlets/DirectiveSpeed.php
index 889bbd315..c4892abe1 100644
--- a/gui/baculum/protected/Web/Portlets/DirectiveSpeed.php
+++ b/gui/baculum/protected/Web/Portlets/DirectiveSpeed.php
@@ -167,28 +167,6 @@ class DirectiveSpeed extends DirectiveTemplate {
 		return $value;
 	}
 
-	/**
-	 * Set allow remove option.
-	 * If set, it shows remoe button for control. Default is set.
-	 *
-	 * @param boolean $allow_remove allow remove state
-	 * @return none
-	 */
-	public function setAllowRemove($allow_remove) {
-		$allow_remove = TPropertyValue::ensureBoolean($allow_remove);
-		$this->setViewState(self::ALLOW_REMOVE, $allow_remove);
-	}
-
-	/**
-	 * Get allow remove state.
-	 * If not set, by default option value is true.
-	 *
-	 * @return boolean allow remove state
-	 */
-	public function getAllowRemove() {
-		return $this->getViewState(self::ALLOW_REMOVE, true);
-	}
-
 	/**
 	 * Set unit type to show in control.
 	 * Allowed values are: decemial or binary.
diff --git a/gui/baculum/protected/Web/Portlets/DirectiveSpeed.tpl b/gui/baculum/protected/Web/Portlets/DirectiveSpeed.tpl
index 2e3adf758..e1fedddcc 100644
--- a/gui/baculum/protected/Web/Portlets/DirectiveSpeed.tpl
+++ b/gui/baculum/protected/Web/Portlets/DirectiveSpeed.tpl
@@ -17,8 +17,8 @@
 			AutoPostBack="false"
 			OnSelectedIndexChanged="saveValue"
 		/> <%=$this->getRequired() ? '&nbsp;<i class="fa fa-asterisk w3-text-red" style="line-height: 40px"></i>' : ''%>
-		<i class="fa fa-undo reset_btn" onclick="var fspeed = Units.format_speed(parseInt('<%=$this->getDefaultValue()%>', 10), 'B/s'); document.getElementById('<%=$this->Directive->ClientID%>').value = fspeed.value; document.getElementById('<%=$this->SpeedFormat->ClientID%>').value = fspeed.format;" alt="<%[ Reset to default value ]%>" title="<%[ Reset to default value ]%>"></i>
-		<i class="fa fa-trash-alt remove_btn<%=$this->getAllowRemove() ? '' : ' hide'%>" onclick="document.getElementById('<%=$this->Directive->ClientID%>').value = '';" alt="<%[ Remove directive ]%>" title="<%[ Remove directive ]%>"></i>
+		<i class="fa fa-undo reset_btn<%=!$this->ShowResetButton ? ' hide' : ''%>" onclick="var fspeed = Units.format_speed(parseInt('<%=$this->getDefaultValue()%>', 10), 'B/s'); document.getElementById('<%=$this->Directive->ClientID%>').value = fspeed.value; document.getElementById('<%=$this->SpeedFormat->ClientID%>').value = fspeed.format;" alt="<%[ Reset to default value ]%>" title="<%[ Reset to default value ]%>"></i>
+		<i class="fa fa-trash-alt remove_btn<%=!$this->ShowRemoveButton ? ' hide' : ''%>" onclick="document.getElementById('<%=$this->Directive->ClientID%>').value = '';" alt="<%[ Remove directive ]%>" title="<%[ Remove directive ]%>"></i>
 		<com:TRequiredFieldValidator
 			ID="DirectiveValidator"
 			ValidationGroup="<%=$this->getValidationGroup()%>"
diff --git a/gui/baculum/protected/Web/Portlets/DirectiveTemplate.php b/gui/baculum/protected/Web/Portlets/DirectiveTemplate.php
index 58fb8d0af..e124204c8 100644
--- a/gui/baculum/protected/Web/Portlets/DirectiveTemplate.php
+++ b/gui/baculum/protected/Web/Portlets/DirectiveTemplate.php
@@ -54,6 +54,8 @@ class DirectiveTemplate extends DirectiveControlTemplate implements IDirectiveFi
 	const VALIDATION_GROUP = 'ValidationGroup';
 	const CSSCLASS = 'CssClass';
 	const DISABLED = 'Disabled';
+	const SHOW_RESET_BUTTON = 'ShowResetButton';
+	const SHOW_REMOVE_BUTTON = 'ShowRemoveButton';
 
 	public $display_directive;
 
@@ -287,5 +289,23 @@ class DirectiveTemplate extends DirectiveControlTemplate implements IDirectiveFi
 		$disabled = TPropertyValue::ensureBoolean($disabled);
 		$this->setViewState(self::DISABLED, $disabled);
 	}
+
+	public function getShowResetButton() {
+		return $this->getViewState(self::SHOW_RESET_BUTTON, true);
+	}
+
+	public function setShowResetButton($show) {
+		$show = TPropertyValue::ensureBoolean($show);
+		$this->setViewState(self::SHOW_RESET_BUTTON, $show);
+	}
+
+	public function getShowRemoveButton() {
+		return $this->getViewState(self::SHOW_REMOVE_BUTTON, true);
+	}
+
+	public function setShowRemoveButton($show) {
+		$show = TPropertyValue::ensureBoolean($show);
+		$this->setViewState(self::SHOW_REMOVE_BUTTON, $show);
+	}
 }
 ?>
diff --git a/gui/baculum/protected/Web/Portlets/DirectiveTextBox.tpl b/gui/baculum/protected/Web/Portlets/DirectiveTextBox.tpl
index a7b87cdb6..802d77554 100644
--- a/gui/baculum/protected/Web/Portlets/DirectiveTextBox.tpl
+++ b/gui/baculum/protected/Web/Portlets/DirectiveTextBox.tpl
@@ -8,8 +8,8 @@
 			ActiveControl.EnableUpdate="false"
 			AutoTrim="true"
 		/> <%=$this->getRequired() ? '&nbsp;<i class="fa fa-asterisk w3-text-red" style="line-height: 40px"></i>' : ''%>
-		<i class="fa fa-undo reset_btn" onclick="document.getElementById('<%=$this->Directive->ClientID%>').value = '<%=$this->getDefaultValue() === 0 ? '' : $this->getDefaultValue()%>';" alt="<%[ Reset to default value ]%>" title="<%[ Reset to default value ]%>"></i>
-		<i class="fa fa-trash-alt remove_btn" onclick="document.getElementById('<%=$this->Directive->ClientID%>').value = '';" alt="<%[ Remove directive ]%>" title="<%[ Remove directive ]%>"></i>
+		<i class="fa fa-undo reset_btn<%=!$this->ShowResetButton ? ' hide' : ''%>" onclick="document.getElementById('<%=$this->Directive->ClientID%>').value = '<%=$this->getDefaultValue() === 0 ? '' : $this->getDefaultValue()%>';" alt="<%[ Reset to default value ]%>" title="<%[ Reset to default value ]%>"></i>
+		<i class="fa fa-trash-alt remove_btn<%=!$this->ShowRemoveButton ? ' hide' : ''%>" onclick="document.getElementById('<%=$this->Directive->ClientID%>').value = '';" alt="<%[ Remove directive ]%>" title="<%[ Remove directive ]%>"></i>
 		<com:TRequiredFieldValidator
 			ID="DirectiveValidator"
 			ValidationGroup="<%=$this->getValidationGroup()%>"
diff --git a/gui/baculum/protected/Web/Portlets/DirectiveTimePeriod.tpl b/gui/baculum/protected/Web/Portlets/DirectiveTimePeriod.tpl
index 61c3279d7..6e525cdd1 100644
--- a/gui/baculum/protected/Web/Portlets/DirectiveTimePeriod.tpl
+++ b/gui/baculum/protected/Web/Portlets/DirectiveTimePeriod.tpl
@@ -17,8 +17,8 @@
 			AutoPostBack="false"
 			OnSelectedIndexChanged="saveValue"
 		/> <%=$this->getRequired() ? '&nbsp;<i class="fa fa-asterisk w3-text-red" style="line-height: 40px"></i>' : ''%>
-		<i class="fa fa-undo reset_btn" onclick="var ftime = Units.format_time_period(parseInt('<%=$this->getDefaultValue()%>', 10), 'second'); document.getElementById('<%=$this->Directive->ClientID%>').value = ftime.value; document.getElementById('<%=$this->TimeFormat->ClientID%>').value = ftime.format;" alt="<%[ Reset to default value ]%>" title="<%[ Reset to default value ]%>"></i>
-		<i class="fa fa-trash-alt remove_btn" onclick="document.getElementById('<%=$this->Directive->ClientID%>').value = '';" alt="<%[ Remove directive ]%>" title="<%[ Remove directive ]%>"></i>
+		<i class="fa fa-undo reset_btn<%=!$this->ShowResetButton ? ' hide' : ''%>" onclick="var ftime = Units.format_time_period(parseInt('<%=$this->getDefaultValue()%>', 10), 'second'); document.getElementById('<%=$this->Directive->ClientID%>').value = ftime.value; document.getElementById('<%=$this->TimeFormat->ClientID%>').value = ftime.format;" alt="<%[ Reset to default value ]%>" title="<%[ Reset to default value ]%>"></i>
+		<i class="fa fa-trash-alt remove_btn<%=!$this->ShowRemoveButton ? ' hide' : ''%>" onclick="document.getElementById('<%=$this->Directive->ClientID%>').value = '';" alt="<%[ Remove directive ]%>" title="<%[ Remove directive ]%>"></i>
 		<com:TRequiredFieldValidator
 			ID="DirectiveValidator"
 			ValidationGroup="<%=$this->getValidationGroup()%>"