From 795688d99c69a7b1481d1a339d41f8a75e6c8d29 Mon Sep 17 00:00:00 2001 From: Jessica Wang Date: Mon, 2 May 2011 15:25:24 -0700 Subject: [PATCH] CloudStack - pod page - Add Network Device - implement for type PxeServer. --- ui/jsp/pod.jsp | 31 +++++++++++++++++++++++++++++++ ui/scripts/cloud.core.pod.js | 16 ++++++++++++++-- 2 files changed, 45 insertions(+), 2 deletions(-) diff --git a/ui/jsp/pod.jsp b/ui/jsp/pod.jsp index 9d863ac42f6..809a9644c79 100644 --- a/ui/jsp/pod.jsp +++ b/ui/jsp/pod.jsp @@ -350,6 +350,37 @@ dictionary = { + + + + diff --git a/ui/scripts/cloud.core.pod.js b/ui/scripts/cloud.core.pod.js index 978e79bb347..efbb5ec0f6c 100644 --- a/ui/scripts/cloud.core.pod.js +++ b/ui/scripts/cloud.core.pod.js @@ -264,8 +264,20 @@ function podNetworkDeviceJsonToTemplate(jsonObj, template) { template.find("#grid_header_title").text(fromdb(jsonObj.url)); template.find("#id").text(fromdb(jsonObj.id)); template.find("#url").text(fromdb(jsonObj.url)); - template.find("#type").text(fromdb(jsonObj.type)); - + template.find("#type").text(fromdb(jsonObj.type)); + if(jsonObj.pingstorageserverip != null) { + template.find("#pingstorageserverip").text(fromdb(jsonObj.pingstorageserverip)); + template.find("#pingstorageserverip_container").show(); + } + if(jsonObj.pingdir != null) { + template.find("#pingdir").text(fromdb(jsonObj.pingdir)); + template.find("#pingdir_container").show(); + } + if(jsonObj.tftpdir != null) { + template.find("#tftpdir").text(fromdb(jsonObj.tftpdir)); + template.find("#tftpdir_container").show(); + } + var $actionLink = template.find("#action_link"); bindActionLink($actionLink);