From 2eaf10e293348ca38d1cea6c01b9d0b56b643fc7 Mon Sep 17 00:00:00 2001
From: will <will@cloud.com>
Date: Thu, 18 Nov 2010 18:27:39 -0800
Subject: [PATCH] bug 5918: added domain to volume detail

---
 ui/jsp/volume.jsp               | 10 ++++++++++
 ui/scripts/cloud.core.volume.js |  3 ++-
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/ui/jsp/volume.jsp b/ui/jsp/volume.jsp
index 0031e36feb4..a095a0239e0 100644
--- a/ui/jsp/volume.jsp
+++ b/ui/jsp/volume.jsp
@@ -168,6 +168,16 @@
 	                    </div>
 	                </div>
 	            </div>
+				<div class="grid_rows even">
+					<div class="grid_row_cell" style="width: 20%;">
+						<div class="row_celltitles">
+							Domain:</div>
+					</div>
+					<div class="grid_row_cell" style="width: 79%;">
+					<div class="row_celltitles" id="domain">
+					</div>
+				</div>
+    </div>   
 	        </div>
 	    </div>    
     </div>
diff --git a/ui/scripts/cloud.core.volume.js b/ui/scripts/cloud.core.volume.js
index 596a209a6c1..a53bbf15797 100644
--- a/ui/scripts/cloud.core.volume.js
+++ b/ui/scripts/cloud.core.volume.js
@@ -329,7 +329,8 @@ function volumeJsonToDetailsTab(){
     $thisTab.find("#device_id").text(fromdb(jsonObj.deviceid));   
     $thisTab.find("#state").text(fromdb(jsonObj.state));    
     $thisTab.find("#storage").text(fromdb(jsonObj.storage));
-    $thisTab.find("#account").text(fromdb(jsonObj.account));     
+    $thisTab.find("#account").text(fromdb(jsonObj.account));  
+	$thisTab.find("#domain").text(fromdb(jsonObj.domain));
     $thisTab.find("#type").text(fromdb(jsonObj.type) + " (" + fromdb(jsonObj.storagetype) + " storage)");
     $thisTab.find("#size").text((jsonObj.size == "0") ? "" : convertBytes(jsonObj.size));	    
     if (jsonObj.virtualmachineid == null)