From: Marcin Haba <marcin.haba@bacula.pl>
Date: Sat, 28 Nov 2015 10:07:29 +0000 (+0100)
Subject: baculum: Add drive parameter to bconsole release command execution
X-Git-Tag: Release-7.4.0~161
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=29a4ffd1690860bec64039359ce16518ff0b5c42;p=bacula%2Fbacula

baculum: Add drive parameter to bconsole release command execution
---

diff --git a/gui/baculum/protected/Pages/API/StorageRelease.php b/gui/baculum/protected/Pages/API/StorageRelease.php
index 8d58565c50..d272f4dddd 100644
--- a/gui/baculum/protected/Pages/API/StorageRelease.php
+++ b/gui/baculum/protected/Pages/API/StorageRelease.php
@@ -23,9 +23,11 @@
 class StorageRelease extends BaculumAPI {
 	public function get() {
 		$storageid = intval($this->Request['id']);
+		$drive = intval($this->Request['drive']);
+
 		$storage = $this->getModule('storage')->getStorageById($storageid);
 		if(!is_null($storage)) {
-			$storageRelease = $this->getModule('bconsole')->bconsoleCommand($this->director, array('release', 'storage="' . $storage->name . '"'), $this->user);
+			$storageRelease = $this->getModule('bconsole')->bconsoleCommand($this->director, array('release', 'storage="' . $storage->name . '"', 'drive="' . $drive . '"'), $this->user);
 			$this->output = $storageRelease->output;
 			$this->error = (integer)$storageRelease->exitcode;
 		} else {
@@ -35,4 +37,4 @@ class StorageRelease extends BaculumAPI {
 	}
 }
 
-?>
\ No newline at end of file
+?>
diff --git a/gui/baculum/protected/application.xml b/gui/baculum/protected/application.xml
index 81f622649c..116597d0f4 100644
--- a/gui/baculum/protected/application.xml
+++ b/gui/baculum/protected/application.xml
@@ -35,7 +35,7 @@
 			<url ServiceParameter="API.StorageStatus" pattern="storages/status/{id}/" parameters.id="\d+" />
 			<url ServiceParameter="API.StorageMount" pattern="storages/mount/{id}/{drive}/{slot}/" parameters.id="\d+" parameters.drive="\d+" parameters.slot="\d+" />
 			<url ServiceParameter="API.StorageUmount" pattern="storages/umount/{id}/{drive}/" parameters.id="\d+" parameters.drive="\d+" />
-			<url ServiceParameter="API.StorageRelease" pattern="storages/release/{id}/" parameters.id="\d+" />
+			<url ServiceParameter="API.StorageRelease" pattern="storages/release/{id}/{drive}/" parameters.id="\d+" parameters.drive="\d+" />
 			<!-- END Storages (storage daemons) -->
 			<!-- START Volumes (media) -->
 			<url ServiceParameter="API.Volumes" pattern="volumes/" />