diff --git a/client/WEB-INF/classes/resources/resource.properties b/client/WEB-INF/classes/resources/resource.properties index 81b2f6b57b2..1b308d9ea31 100644 --- a/client/WEB-INF/classes/resources/resource.properties +++ b/client/WEB-INF/classes/resources/resource.properties @@ -144,4 +144,6 @@ please.confirm.you.want.to.reboot.router = Please confirm you want to reboot rou please.confirm.you.want.to.start.systemVM = Please confirm you want to start system VM please.confirm.you.want.to.stop.systemVM = Please confirm you want to stop system VM -please.confirm.you.want.to.reboot.systemVM = Please confirm you want to reboot system VM \ No newline at end of file +please.confirm.you.want.to.reboot.systemVM = Please confirm you want to reboot system VM + +customizable.during.VM.creation = Customizable during VM creation \ No newline at end of file diff --git a/ui/jsp/diskoffering.jsp b/ui/jsp/diskoffering.jsp index 1ed50f45e93..25c4fc9d15e 100644 --- a/ui/jsp/diskoffering.jsp +++ b/ui/jsp/diskoffering.jsp @@ -118,7 +118,21 @@
- + + + +
+
+
+ <%=t.t("customizable.during.VM.creation")%>:
+
+
+
+
+
+
+ +
diff --git a/ui/scripts/cloud.core.diskoffering.js b/ui/scripts/cloud.core.diskoffering.js index 69aedde15cf..1e2f4a9a1b4 100644 --- a/ui/scripts/cloud.core.diskoffering.js +++ b/ui/scripts/cloud.core.diskoffering.js @@ -65,7 +65,7 @@ function afterLoadDiskOfferingJSP() { array1.push("&tags="+todb(tags)); $.ajax({ - data: createURL("command=createDiskOffering&isMirrored=false&response=json" + array1.join("")), + data: createURL("command=createDiskOffering&isMirrored=false" + array1.join("")), dataType: "json", success: function(json) { var item = json.creatediskofferingresponse; @@ -199,6 +199,9 @@ function diskOfferingJsonToDetailsTab() { $thisTab.find("#disksize").text(convertBytes(jsonObj.disksize)); $thisTab.find("#tags").text(fromdb(jsonObj.tags)); + + setBooleanReadField(jsonObj.isCustomized, $thisTab.find("#isCustomized")); + $thisTab.find("#domain").text(fromdb(jsonObj.domain)); //actions ***