From 65be1165423e4d24b81bf1da678fe5ffe237e07a Mon Sep 17 00:00:00 2001
From: Marcin Haba <marcin.haba@bacula.pl>
Date: Sat, 2 Dec 2017 18:39:51 +0100
Subject: [PATCH] baculum: Revert back volume pool name in volume list window

---
 gui/baculum/protected/Web/Portlets/VolumeList.php | 11 ++++++++++-
 gui/baculum/protected/Web/Portlets/VolumeList.tpl |  5 ++++-
 gui/baculum/themes/Baculum-v1/style.css           |  2 +-
 3 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/gui/baculum/protected/Web/Portlets/VolumeList.php b/gui/baculum/protected/Web/Portlets/VolumeList.php
index cd9ecf27f0..8e24fad052 100644
--- a/gui/baculum/protected/Web/Portlets/VolumeList.php
+++ b/gui/baculum/protected/Web/Portlets/VolumeList.php
@@ -34,7 +34,8 @@ class VolumeList extends Portlets implements ISlideWindow {
 	public $ID;
 	public $buttonID;
 	public $windowTitle;
-	public $view;
+	public $pools = array();
+	public $old_pool;
 
 	public function setID($id) {
 		$this->ID = $id;
@@ -61,6 +62,7 @@ class VolumeList extends Portlets implements ISlideWindow {
 	}
 
 	public function prepareData($sender, $param) {
+		$this->setPoolList();
 		$params = $this->getUrlParams(array('volumes'), $this->getPage()->VolumeWindow->ID);
 		$volumes = $this->Application->getModule('api')->get($params);
 		$isDetailView = $_SESSION['view' . $this->getPage()->VolumeWindow->ID] == 'details';
@@ -78,6 +80,13 @@ class VolumeList extends Portlets implements ISlideWindow {
 		}
 	}
 
+	private function setPoolList() {
+		$pools = $this->Application->getModule('api')->get(array('pools'));
+		for ($i = 0; $i < count($pools->output); $i++) {
+			$this->pools[$pools->output[$i]->poolid] = $pools->output[$i]->name;
+		}
+	}
+
 	protected function sortData($data, $key, $id) {
 		if($this->getSortOrder($id) == parent::SORT_DESC) {
 			if($key == 'pool') {
diff --git a/gui/baculum/protected/Web/Portlets/VolumeList.tpl b/gui/baculum/protected/Web/Portlets/VolumeList.tpl
index 7e138d28bb..05f6e28176 100644
--- a/gui/baculum/protected/Web/Portlets/VolumeList.tpl
+++ b/gui/baculum/protected/Web/Portlets/VolumeList.tpl
@@ -3,10 +3,13 @@
 	<com:TActivePanel ID="RepeaterShow">
 	<com:TActiveRepeater ID="Repeater">
 		<prop:ItemTemplate>
+			<%#$this->SourceTemplateControl->old_pool != $this->SourceTemplateControl->pools[$this->DataItem->poolid] ? '<div class="window-section"><span>' . Prado::localize('Pool:') . ' ' . $this->SourceTemplateControl->pools[$this->DataItem->poolid]  . '<span></div>': ''%>
+
 			<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>
+			<%#!($this->SourceTemplateControl->old_pool = $this->SourceTemplateControl->pools[$this->DataItem->poolid])%>
 		</prop:ItemTemplate>
 	</com:TActiveRepeater>
 	</com:TActivePanel>
@@ -39,7 +42,7 @@
 		/>
 		<com:TActiveTemplateColumn HeaderText="<%[ Pool ]%>" SortExpression="pool">
 			<prop:ItemTemplate>
-				<div title="<%=$this->getParent()->Data['pool']['name']%>"><%=$this->getPage()->VolumeWindow->formatVolumeField($this->getParent()->Data['pool']['name'])%></div>
+				<div title="<%#$this->SourceTemplateControl->pools[$this->getParent()->Data['poolid']]%>"><%#$this->getPage()->VolumeWindow->formatVolumeField($this->SourceTemplateControl->pools[$this->getParent()->Data['poolid']])%></div>
 			</prop:ItemTemplate>
 		</com:TActiveTemplateColumn>
 		<com:TActiveTemplateColumn HeaderText="<%[ Status ]%>" SortExpression="volstatus">
diff --git a/gui/baculum/themes/Baculum-v1/style.css b/gui/baculum/themes/Baculum-v1/style.css
index 222a8a81f2..c925fa1a14 100644
--- a/gui/baculum/themes/Baculum-v1/style.css
+++ b/gui/baculum/themes/Baculum-v1/style.css
@@ -794,7 +794,7 @@ div.window-section {
 	width: 100%;
 	height: 25px;
 	clear: both;
-	padding-top: 6px;
+	padding-top: 12px;
 	font-size: 13px;
 }
 
-- 
2.39.5