From edeb3f3ea70c9fac7feaf47a778f5940db7cbdc1 Mon Sep 17 00:00:00 2001
From: Marcin Haba <marcin.haba@bacula.pl>
Date: Sun, 4 Aug 2019 16:03:27 +0200
Subject: [PATCH] baculum: Fix using nested directives in repeater control

---
 .../Web/Portlets/BaculaConfigResources.tpl    |  1 -
 .../Web/Portlets/DirectiveMessages.php        |  2 +-
 .../Web/Portlets/DirectiveRenderer.php        | 20 ++++++++++++++++---
 .../Web/Portlets/DirectiveRunscript.php       |  2 +-
 .../Web/Portlets/DirectiveSchedule.php        |  2 +-
 .../Web/Portlets/DirectiveSchedule.tpl        |  2 +-
 .../Web/Portlets/NewScheduleMenu.tpl          |  2 +-
 7 files changed, 22 insertions(+), 9 deletions(-)

diff --git a/gui/baculum/protected/Web/Portlets/BaculaConfigResources.tpl b/gui/baculum/protected/Web/Portlets/BaculaConfigResources.tpl
index 9b75720dc..00f1a98ef 100644
--- a/gui/baculum/protected/Web/Portlets/BaculaConfigResources.tpl
+++ b/gui/baculum/protected/Web/Portlets/BaculaConfigResources.tpl
@@ -37,7 +37,6 @@
 							Attributes.onclick="return BaculaConfig.unset_config_items(this.id);"
 							Text="<strong><%=$this->Data['resource_type']%></strong>: <%=$this->Data['resource_name']%>"
 							Style="text-decoration: none"
-							CommandParameter="show"
 						/>
 							<i class="fa fa-sync w3-spin" style="display: none"><i/>
 						</td>
diff --git a/gui/baculum/protected/Web/Portlets/DirectiveMessages.php b/gui/baculum/protected/Web/Portlets/DirectiveMessages.php
index fbacf4543..7d1634877 100644
--- a/gui/baculum/protected/Web/Portlets/DirectiveMessages.php
+++ b/gui/baculum/protected/Web/Portlets/DirectiveMessages.php
@@ -64,7 +64,7 @@ class DirectiveMessages extends DirectiveListTemplate {
 		'Volmgmt'
 	);
 
-	public function loadConfig($sender, $param) {
+	public function loadConfig() {
 		$load_values = $this->getLoadValues();
 		$destinations = (array)$this->getData();
 		if (array_key_exists('Type', $destinations)) {
diff --git a/gui/baculum/protected/Web/Portlets/DirectiveRenderer.php b/gui/baculum/protected/Web/Portlets/DirectiveRenderer.php
index 6245a993e..b9352fee7 100644
--- a/gui/baculum/protected/Web/Portlets/DirectiveRenderer.php
+++ b/gui/baculum/protected/Web/Portlets/DirectiveRenderer.php
@@ -66,9 +66,22 @@ class DirectiveRenderer extends DirectiveListTemplate implements IDataRenderer {
 
 	public $resource_names = array();
 
+	private $item_loaded = false;
+
 	public function onLoad($param) {
 		parent::onLoad($param);
-		$this->createItemInternal();
+		if (!$this->item_loaded) {
+			$this->createItemInternal();
+			$this->item_loaded = true;
+		}
+	}
+
+	public function dataBind() {
+		if (!$this->item_loaded) {
+			$this->createItemInternal();
+			$this->item_loaded = true;
+		}
+		parent::dataBind();
 	}
 
 	public function createItemInternal() {
@@ -76,11 +89,12 @@ class DirectiveRenderer extends DirectiveListTemplate implements IDataRenderer {
 		$item = $this->createItem($data);
 
 		$this->addParsedObject($item);
+		$cmd = $item->getCmdParam();
 
 		if ($item instanceof DirectiveTemplate) {
 			$item->createDirective();
-		} elseif ($item instanceof DirectiveListTemplate) {
-			$item->loadConfig(null, null);
+		} elseif ($item instanceof DirectiveListTemplate && $cmd === '') {
+			$item->loadConfig();
 		}
 	}
 
diff --git a/gui/baculum/protected/Web/Portlets/DirectiveRunscript.php b/gui/baculum/protected/Web/Portlets/DirectiveRunscript.php
index 8558a1a9d..024e55257 100644
--- a/gui/baculum/protected/Web/Portlets/DirectiveRunscript.php
+++ b/gui/baculum/protected/Web/Portlets/DirectiveRunscript.php
@@ -33,7 +33,7 @@ class DirectiveRunscript extends DirectiveListTemplate {
 		'DirectiveComboBox'
 	);
 
-	public function loadConfig($sender, $param) {
+	public function loadConfig() {
 		$load_values = $this->getLoadValues();
 		$host = $this->getHost();
 		$component_type = $this->getComponentType();
diff --git a/gui/baculum/protected/Web/Portlets/DirectiveSchedule.php b/gui/baculum/protected/Web/Portlets/DirectiveSchedule.php
index 531e892de..ccc36bb91 100644
--- a/gui/baculum/protected/Web/Portlets/DirectiveSchedule.php
+++ b/gui/baculum/protected/Web/Portlets/DirectiveSchedule.php
@@ -80,7 +80,7 @@ class DirectiveSchedule extends DirectiveListTemplate {
 		'TimeMinHourly'
 	);
 
-	public function loadConfig($sender, $param) {
+	public function loadConfig() {
 		$load_values = $this->getLoadValues();
 		$directives = $this->getData();
 		$host = $this->getHost();
diff --git a/gui/baculum/protected/Web/Portlets/DirectiveSchedule.tpl b/gui/baculum/protected/Web/Portlets/DirectiveSchedule.tpl
index 261b8c9ca..2dbe03823 100644
--- a/gui/baculum/protected/Web/Portlets/DirectiveSchedule.tpl
+++ b/gui/baculum/protected/Web/Portlets/DirectiveSchedule.tpl
@@ -3,7 +3,7 @@
 <com:TActiveRepeater ID="RepeaterScheduleRuns" OnItemDataBound="createRunItem">
 	<prop:ItemTemplate>
 		<div class="w3-card-4 w3-padding w3-margin-bottom directive runscript">
-			<h2><%[ Run ]%> #<%=($this->ItemIndex+1)%></h2>
+			<h2 class="schedule_options"><%[ Run ]%> #<%=($this->ItemIndex+1)%></h2>
 			<com:Application.Web.Portlets.DirectiveComboBox
 				ID="Level"
 			/>
diff --git a/gui/baculum/protected/Web/Portlets/NewScheduleMenu.tpl b/gui/baculum/protected/Web/Portlets/NewScheduleMenu.tpl
index 14d8ba77a..1b3ffa785 100644
--- a/gui/baculum/protected/Web/Portlets/NewScheduleMenu.tpl
+++ b/gui/baculum/protected/Web/Portlets/NewScheduleMenu.tpl
@@ -5,7 +5,7 @@
 			ID="RunscriptItem"
 			OnCommand="Parent.SourceTemplateControl.newScheduleDirective"
 			CommandParameter="save"
-			ClientSide.OnComplete="var el = $('#<%=$this->RunscriptItem->ClientID%>').parents('div').find('h2'); BaculaConfig.scroll_to_element(el[el.length-1]);"
+			ClientSide.OnComplete="var el = $('#<%=$this->RunscriptItem->ClientID%>').parents('div').find('h2.schedule_options'); BaculaConfig.scroll_to_element(el[el.length-1], -100);"
 			Text="Run"
 			Attributes.onclick="$(this).closest('div.config_new_schedule').hide();"
 			/>
-- 
2.47.3