From: Marcin Haba <marcin.haba@bacula.pl>
Date: Tue, 21 Nov 2017 20:28:20 +0000 (+0100)
Subject: baculum: Stop using hidden fields to store item identifiers
X-Git-Tag: Release-9.0.7~32
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=342b9cda4455c07d24132134ee0bc71b9a0bb39e;p=bacula%2Fbacula

baculum: Stop using hidden fields to store item identifiers
---

diff --git a/gui/baculum/protected/API/endpoints.xml b/gui/baculum/protected/API/endpoints.xml
index cc5c656d45..6a9146e75f 100644
--- a/gui/baculum/protected/API/endpoints.xml
+++ b/gui/baculum/protected/API/endpoints.xml
@@ -37,8 +37,6 @@
 	<!-- volumes (media) endpoints-->
 	<url ServiceParameter="API.Volumes" pattern="api/volumes/" />
 	<url ServiceParameter="API.Volumes" pattern="api/volumes/limit/{limit}/" parameters.limit="\d+" />
-	<url ServiceParameter="API.Volumes" pattern="api/volumes/withpools/" />
-	<url ServiceParameter="API.Volumes" pattern="api/volumes/withpools/limit/{limit}/" parameters.limit="\d+" />
 	<url ServiceParameter="API.Volume" pattern="api/volumes/{id}/" parameters.id="\d+" />
 	<url ServiceParameter="API.VolumePrune" pattern="api/volumes/prune/{id}/" parameters.id="\d+" />
 	<url ServiceParameter="API.VolumePurge" pattern="api/volumes/purge/{id}/" parameters.id="\d+" />
diff --git a/gui/baculum/protected/Web/JavaScript/slide-window.js b/gui/baculum/protected/Web/JavaScript/slide-window.js
index ce24cf7fd0..442fcf5050 100644
--- a/gui/baculum/protected/Web/JavaScript/slide-window.js
+++ b/gui/baculum/protected/Web/JavaScript/slide-window.js
@@ -146,9 +146,9 @@ var SlideWindowClass = jQuery.klass({
 			if (actions_btn.length === 1) {
 				actions_btn[0].addEventListener('mouseup', function(e) {
 					var row = self.getGridRowUnderCursor(e);
-					var el = $(row).find('input[type=hidden]');
+					var el = $(row).find('div[data-type="item_value"]');
 					if(el.length === 1) {
-						self.actionsRequest.setCallbackParameter(el[0].value);
+						self.actionsRequest.setCallbackParameter(el[0].getAttribute('rel'));
 						self.actionsRequest.dispatch();
 					}
 				});
@@ -276,9 +276,16 @@ var SlideWindowClass = jQuery.klass({
 		}
 
 		var set_callback_parameter = function(element) {
-			var el = $(element).find('input[type=hidden]')
-			if(el.length === 1) {
-				var val = el[0].value;
+			var val;
+			if ($('#' + this.gridEl).length === 1) {
+				var el = $(element).find('div[data-type="item_value"]')
+				if (el.length === 1) {
+					val = el[0].getAttribute('rel');
+				}
+			} else if ($('#' + this.repeaterEl).length === 1) {
+				val = element.getAttribute('rel');
+			}
+			if (val) {
 				this.openConfigurationById(val);
 			}
 		}.bind(this);
@@ -295,7 +302,9 @@ var SlideWindowClass = jQuery.klass({
 			});
 		}.bind(this));
 		Formatters.set_formatters();
-		this.revertSortingFromCookie();
+		if (grid.length === 1) {
+			this.revertSortingFromCookie();
+		}
 	},
 
 	openConfigurationById: function(id) {
@@ -447,7 +456,7 @@ var SlideWindowClass = jQuery.klass({
 	},
 	setActions: function() {
 		var checkboxes = this.getCheckboxes();
-		checkboxes.each(function(index, el) {
+		$(checkboxes).each(function(index, el) {
 			$(el).on('change', function() {
 				var is_checked = this.isAnyChecked(checkboxes);
 				if(is_checked === true && !this.areActionsOpen()) {
diff --git a/gui/baculum/protected/Web/Portlets/ClientList.tpl b/gui/baculum/protected/Web/Portlets/ClientList.tpl
index 9c05a1db58..eaf1d8ac8f 100644
--- a/gui/baculum/protected/Web/Portlets/ClientList.tpl
+++ b/gui/baculum/protected/Web/Portlets/ClientList.tpl
@@ -3,10 +3,9 @@
 	<com:TActivePanel ID="RepeaterShow">
 		<com:TActiveRepeater ID="Repeater">
 			<prop:ItemTemplate>
-				<com:TPanel ID="ClientElement" CssClass="slide-window-element" ToolTip="<%=@$this->DataItem->uname%>">
-					<img src="<%=$this->getPage()->getTheme()->getBaseUrl()%>/client-icon.png" alt="" /><%=@$this->DataItem->name%>
-					<input type="hidden" name="<%=$this->ClientID%>" value="<%=isset($this->DataItem->clientid) ? $this->DataItem->clientid : ''%>" />
-				</com:TPanel>
+				<div data-type="item_value" rel="<%#$this->DataItem->clientid%>" class="slide-window-element" title="<%=@$this->DataItem->uname%>">
+					<img src="<%=$this->getPage()->getTheme()->getBaseUrl()%>/client-icon.png" alt="" /><%#$this->DataItem->name%>
+				</div>
 			</prop:ItemTemplate>
 		</com:TActiveRepeater>
 	</com:TActivePanel>
@@ -23,8 +22,7 @@
 		>
 			<com:TActiveTemplateColumn HeaderText="<%[ Client name ]%>" SortExpression="name">
 				<prop:ItemTemplate>
-					<div><%=$this->getParent()->Data['name']%></div>
-					<input type="hidden" name="<%=$this->getParent()->ClientID%>" value="<%=$this->getParent()->Data['clientid']%>" />
+					<div data-type="item_value" rel="<%=$this->getParent()->Data['clientid']%>"><%=$this->getParent()->Data['name']%></div>
 				</prop:ItemTemplate>
 			</com:TActiveTemplateColumn>
 			<com:TActiveTemplateColumn ItemStyle.HorizontalAlign="Center" HeaderText="AutoPrune" SortExpression="autoprune">
diff --git a/gui/baculum/protected/Web/Portlets/JobList.tpl b/gui/baculum/protected/Web/Portlets/JobList.tpl
index 51c816a6b7..3108d19848 100644
--- a/gui/baculum/protected/Web/Portlets/JobList.tpl
+++ b/gui/baculum/protected/Web/Portlets/JobList.tpl
@@ -3,10 +3,9 @@
 	<com:TActivePanel ID="RepeaterShow" EnableViewState="false">
 	<com:TActiveRepeater ID="Repeater" EnableViewState="false">
 		<prop:ItemTemplate>
-			<com:TPanel ID="JobElement" CssClass="slide-window-element">
-				<img src="<%=$this->getPage()->getTheme()->getBaseUrl()%>/job-icon.png" alt="" /> [<%=@$this->DataItem->jobid%>] <%=@$this->DataItem->name%>
-				<input type="hidden" name="<%=$this->ClientID%>" value="<%=isset($this->DataItem->jobid) ? $this->DataItem->jobid : ''%>" />
-			</com:TPanel>
+			<div data-type="item_value" rel="<%#$this->DataItem->jobid%>" class="slide-window-element">
+				<img src="<%=$this->getPage()->getTheme()->getBaseUrl()%>/job-icon.png" alt="" /> [<%#$this->DataItem->jobid%>] <%#$this->DataItem->name%>
+			</div>
 		</prop:ItemTemplate>
 	</com:TActiveRepeater>
 	</com:TActivePanel>
@@ -35,8 +34,7 @@
 		/>
 		<com:TActiveTemplateColumn HeaderText="<%[ Job name ]%>" SortExpression="name">
 			<prop:ItemTemplate>
-				<div title="<%=$this->getParent()->Data['name']%>"><%=$this->getPage()->JobWindow->formatJobName($this->getParent()->Data['name'])%></div>
-                                <input type="hidden" name="<%=$this->getParent()->ClientID%>" value="<%=$this->getParent()->Data['jobid']%>" />
+				<div data-type="item_value" rel="<%=$this->getParent()->Data['jobid']%>" title="<%=$this->getParent()->Data['name']%>"><%=$this->getPage()->JobWindow->formatJobName($this->getParent()->Data['name'])%></div>
 			</prop:ItemTemplate>
 		</com:TActiveTemplateColumn>
 		<com:TActiveTemplateColumn ItemTemplate="<%=isset($this->getPage()->JobWindow->jobTypes[$this->getParent()->Data['type']]) ? $this->getPage()->JobWindow->jobTypes[$this->getParent()->Data['type']] : ''%>" SortExpression="type">
diff --git a/gui/baculum/protected/Web/Portlets/JobRunList.tpl b/gui/baculum/protected/Web/Portlets/JobRunList.tpl
index 823f578f84..2e158762f8 100644
--- a/gui/baculum/protected/Web/Portlets/JobRunList.tpl
+++ b/gui/baculum/protected/Web/Portlets/JobRunList.tpl
@@ -4,11 +4,9 @@
 	<com:TActiveRepeater ID="Repeater">
 		<prop:ItemTemplate>
 			<%=($this->getPage()->JobRunWindow->oldDirector != $this->DataItem['director']) ? '<div class="window-section"><span>' . Prado::localize('Director:') . ' ' . $this->DataItem['director']  . '<span></div>': ''%>
-			<com:TPanel ID="JobRunElement" CssClass="slide-window-element" >
-				<img src="<%=$this->getPage()->getTheme()->getBaseUrl()%>/job-icon.png" alt="" /> <%=@$this->DataItem['name']%>
-				<input type="hidden" name="<%=$this->ClientID%>" value="<%=isset($this->DataItem['name']) ? $this->DataItem['name'] : ''%>" />
-
-			</com:TPanel>
+			<div data-type="item_value" rel="<%#$this->DataItem['name']%>" class="slide-window-element">
+				<img src="<%=$this->getPage()->getTheme()->getBaseUrl()%>/job-icon.png" alt="" /> <%#$this->DataItem['name']%>
+			</div>
 			<%=!($this->getPage()->JobRunWindow->oldDirector = $this->DataItem['director'])%>
 		</prop:ItemTemplate>
 	</com:TActiveRepeater>
@@ -26,8 +24,7 @@
 	>
 		<com:TActiveTemplateColumn HeaderText="<%[ Job name ]%>" SortExpression="name">
 			<prop:ItemTemplate>
-				<div><%=$this->getParent()->DataItem['name']%></div>
-                                <input type="hidden" name="<%=$this->getParent()->ClientID%>" value="<%=$this->getParent()->DataItem['name']%>" />
+				<div data-type="item_value" rel="<%=$this->getParent()->DataItem['name']%>"><%=$this->getParent()->DataItem['name']%></div>
 			</prop:ItemTemplate>
 		</com:TActiveTemplateColumn>
 		<com:TActiveBoundColumn
diff --git a/gui/baculum/protected/Web/Portlets/PoolList.tpl b/gui/baculum/protected/Web/Portlets/PoolList.tpl
index ae06ee37c1..4ee65e2f61 100644
--- a/gui/baculum/protected/Web/Portlets/PoolList.tpl
+++ b/gui/baculum/protected/Web/Portlets/PoolList.tpl
@@ -3,10 +3,9 @@
 	<com:TActivePanel ID="RepeaterShow">
 		<com:TActiveRepeater ID="Repeater">
 			<prop:ItemTemplate>
-				<com:TPanel ID="PoolElement" CssClass="slide-window-element">
-					<img src="<%=$this->getPage()->getTheme()->getBaseUrl()%>/pool.png" alt="" /><%=@$this->DataItem->name%>
-					<input type="hidden" name="<%=$this->ClientID%>" value="<%=isset($this->DataItem->poolid) ? $this->DataItem->poolid : ''%>" />
-				</com:TPanel>
+				<div data-type="item_value" rel="<%#$this->DataItem->poolid%>" class="slide-window-element">
+					<img src="<%=$this->getPage()->getTheme()->getBaseUrl()%>/pool.png" alt="" /><%#$this->DataItem->name%>
+				</div>
 			</prop:ItemTemplate>
 		</com:TActiveRepeater>
 	</com:TActivePanel>
@@ -24,8 +23,7 @@
 		>
 			<com:TActiveTemplateColumn HeaderText="Pool name" SortExpression="name">
 				<prop:ItemTemplate>
-					<div><%=$this->getParent()->Data['name']%></div>
-					<input type="hidden" name="<%=$this->getParent()->ClientID%>" value="<%=$this->getParent()->Data['poolid']%>" />
+					<div data-type="item_value" rel="<%=$this->getParent()->Data['poolid']%>"><%=$this->getParent()->Data['name']%></div>
 				</prop:ItemTemplate>
 			</com:TActiveTemplateColumn>
 			<com:TActiveBoundColumn
diff --git a/gui/baculum/protected/Web/Portlets/StorageList.tpl b/gui/baculum/protected/Web/Portlets/StorageList.tpl
index df410afb2b..ffbb6a99bf 100644
--- a/gui/baculum/protected/Web/Portlets/StorageList.tpl
+++ b/gui/baculum/protected/Web/Portlets/StorageList.tpl
@@ -3,10 +3,9 @@
 	<com:TActivePanel ID="RepeaterShow">
 		<com:TActiveRepeater ID="Repeater">
 			<prop:ItemTemplate>
-				<com:TPanel ID="StorageElement" CssClass="slide-window-element">
-					<img src="<%=$this->getPage()->getTheme()->getBaseUrl()%>/server-storage-icon.png" alt="" /><%=@$this->DataItem->name%>
-					<input type="hidden" name="<%=$this->ClientID%>" value="<%=isset($this->DataItem->storageid) ? $this->DataItem->storageid : ''%>" />
-				</com:TPanel>
+				<div data-type="item_value" rel="<%#$this->DataItem->storageid%>" class="slide-window-element">
+					<img src="<%=$this->getPage()->getTheme()->getBaseUrl()%>/server-storage-icon.png" alt="" /><%#$this->DataItem->name%>
+				</div>
 			</prop:ItemTemplate>
 		</com:TActiveRepeater>
 	</com:TActivePanel>
@@ -23,8 +22,7 @@
 		>
 			<com:TActiveTemplateColumn HeaderText="<%[ Storage name ]%>" SortExpression="name">
 				<prop:ItemTemplate>
-					<div><%=$this->getParent()->Data['name']%></div>
-					<input type="hidden" name="<%=$this->getParent()->ClientID%>" value="<%=$this->getParent()->Data['storageid']%>" />
+					<div data-type="item_value" rel="<%=$this->getParent()->Data['storageid']%>"><%=$this->getParent()->Data['name']%></div>
 				</prop:ItemTemplate>
 			</com:TActiveTemplateColumn>
 			<com:TActiveTemplateColumn HeaderText="<%[ Autochanger ]%>" SortExpression="autochanger" ItemStyle.HorizontalAlign="Center">
diff --git a/gui/baculum/protected/Web/Portlets/VolumeList.php b/gui/baculum/protected/Web/Portlets/VolumeList.php
index b723837d3b..cd9ecf27f0 100644
--- a/gui/baculum/protected/Web/Portlets/VolumeList.php
+++ b/gui/baculum/protected/Web/Portlets/VolumeList.php
@@ -34,8 +34,6 @@ class VolumeList extends Portlets implements ISlideWindow {
 	public $ID;
 	public $buttonID;
 	public $windowTitle;
-	public $pools;
-	public $oldPool;
 	public $view;
 
 	public function setID($id) {
@@ -63,7 +61,7 @@ class VolumeList extends Portlets implements ISlideWindow {
 	}
 
 	public function prepareData($sender, $param) {
-		$params = $this->getUrlParams(array('volumes', 'withpools'), $this->getPage()->VolumeWindow->ID);
+		$params = $this->getUrlParams(array('volumes'), $this->getPage()->VolumeWindow->ID);
 		$volumes = $this->Application->getModule('api')->get($params);
 		$isDetailView = $_SESSION['view' . $this->getPage()->VolumeWindow->ID] == 'details';
 		if($isDetailView === true) {
@@ -101,7 +99,7 @@ class VolumeList extends Portlets implements ISlideWindow {
 	}
 
 	public function sortDataGrid($sender, $param) {
-		$params = $this->getUrlParams(array('volumes', 'withpools'), $this->getPage()->VolumeWindow->ID);
+		$params = $this->getUrlParams(array('volumes'), $this->getPage()->VolumeWindow->ID);
 		$data = $this->Application->getModule('api')->get($params)->output;
 		$data = $this->Application->getModule('misc')->objectToArray($data);
 		$this->DataGrid->DataSource = $this->sortData($data, $param->SortExpression, $sender->UniqueID);
diff --git a/gui/baculum/protected/Web/Portlets/VolumeList.tpl b/gui/baculum/protected/Web/Portlets/VolumeList.tpl
index 6fa0345c39..7e138d28bb 100644
--- a/gui/baculum/protected/Web/Portlets/VolumeList.tpl
+++ b/gui/baculum/protected/Web/Portlets/VolumeList.tpl
@@ -3,13 +3,10 @@
 	<com:TActivePanel ID="RepeaterShow">
 	<com:TActiveRepeater ID="Repeater">
 		<prop:ItemTemplate>
-			<%=(isset($this->DataItem->pool->name) && $this->getPage()->VolumeWindow->oldPool != $this->DataItem->pool->name) ? '<div class="window-section"><span>' . Prado::localize('Pool:') . ' ' . $this->DataItem->pool->name  . '<span></div>': ''%>
-			<com:TPanel ID="VolumeElement" CssClass="slide-window-element" ToolTip="<%=(isset($this->DataItem->recycle) && $this->DataItem->recycle == 1 && !empty($this->DataItem->lastwritten) && in_array($this->DataItem->volstatus, array('Full', 'Used'))) ? Prado::localize('When expire:') . date( 'Y-m-d H:i:s', (strtotime($this->DataItem->lastwritten) + $this->DataItem->volretention)) : ''%> <%=Prado::localize('Last written:')%> <%=!empty($this->DataItem->lastwritten) ? $this->DataItem->lastwritten : Prado::localize('never written')%>">
-				<img src="<%=$this->getPage()->getTheme()->getBaseUrl()%>/media-icon.png" alt="" /><%=@$this->DataItem->volumename%>
-				<div id="<%=isset($this->DataItem->volumename) ? $this->DataItem->volumename : ''%>_sizebar" class="status-bar-<%=isset($this->DataItem->volstatus) ? strtolower($this->DataItem->volstatus) : ''%>"><%=isset($this->DataItem->volstatus) ? $this->DataItem->volstatus : ''%></div>
-				<input type="hidden" name="<%=$this->ClientID%>" value="<%=isset($this->DataItem->mediaid) ? $this->DataItem->mediaid : ''%>" />
-			</com:TPanel>
-			<%=!(isset($this->DataItem->pool->name) ? ($this->getPage()->VolumeWindow->oldPool = $this->DataItem->pool->name) : false)%>
+			<div data-type="item_value" rel="<%#$this->DataItem->mediaid%>" class="slide-window-element" title="<%#($this->DataItem->recycle == 1 && !empty($this->DataItem->lastwritten) && in_array($this->DataItem->volstatus, array('Full', 'Used'))) ? Prado::localize('When expire:') . date( ' Y-m-d H:i:s', (strtotime($this->DataItem->lastwritten) + $this->DataItem->volretention)) : ''%> <%=Prado::localize('Last written:')%> <%=!empty($this->DataItem->lastwritten) ? $this->DataItem->lastwritten : Prado::localize('never written')%>">
+				<img src="<%=$this->getPage()->getTheme()->getBaseUrl()%>/media-icon.png" alt="" /><%#$this->DataItem->volumename%>
+				<div id="<%#$this->DataItem->volumename%>_sizebar" class="status-bar-<%#strtolower($this->DataItem->volstatus)%>"><%#$this->DataItem->volstatus%></div>
+			</div>
 		</prop:ItemTemplate>
 	</com:TActiveRepeater>
 	</com:TActivePanel>
@@ -31,8 +28,7 @@
                 </com:TTemplateColumn>
 		<com:TActiveTemplateColumn HeaderText="<%[ Volume name ]%>" SortExpression="volumename">
 			<prop:ItemTemplate>
-				<div title="<%=$this->getParent()->Data['volumename']%>"><%=$this->getPage()->VolumeWindow->formatVolumeField($this->getParent()->Data['volumename'])%></div>
-				<input type="hidden" name="<%=$this->getParent()->ClientID%>" value="<%=$this->getParent()->Data['mediaid']%>" />
+				<div data-type="item_value" rel="<%=$this->getParent()->Data['mediaid']%>" title="<%=$this->getParent()->Data['volumename']%>"><%=$this->getPage()->VolumeWindow->formatVolumeField($this->getParent()->Data['volumename'])%></div>
 			</prop:ItemTemplate>
 		</com:TActiveTemplateColumn>
 		<com:TActiveBoundColumn