mirror of https://github.com/apache/cloudstack.git
bug 10294: cloudStack - add template dialog - add new field "is extractable".
This commit is contained in:
Jessica Wang
parent
d95cc56d8f
commit
eee0ee5370
|
|
@ -151,8 +151,18 @@ dictionary = {
|
|||
<div class="row_celltitles" id="size">
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="grid_rows odd">
|
||||
<div class="grid_row_cell" style="width: 20%;">
|
||||
<div class="row_celltitles">
|
||||
<fmt:message key="extractable"/>:</div>
|
||||
</div>
|
||||
<div class="grid_row_cell" style="width: 79%;">
|
||||
<div class="row_celltitles" id="isextractable">
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="grid_rows even">
|
||||
<div class="grid_row_cell" style="width: 20%;">
|
||||
<div class="row_celltitles">
|
||||
<fmt:message key="label.password.enabled"/>:</div>
|
||||
|
|
@ -166,7 +176,7 @@ dictionary = {
|
|||
</select>
|
||||
</div>
|
||||
</div>
|
||||
<div class="grid_rows even">
|
||||
<div class="grid_rows odd">
|
||||
<div class="grid_row_cell" style="width: 20%;">
|
||||
<div class="row_celltitles">
|
||||
<fmt:message key="label.public"/>:</div>
|
||||
|
|
@ -180,7 +190,7 @@ dictionary = {
|
|||
</select>
|
||||
</div>
|
||||
</div>
|
||||
<div class="grid_rows odd">
|
||||
<div class="grid_rows even">
|
||||
<div class="grid_row_cell" style="width: 20%;">
|
||||
<div class="row_celltitles">
|
||||
<fmt:message key="label.featured"/>:</div>
|
||||
|
|
@ -194,7 +204,7 @@ dictionary = {
|
|||
</select>
|
||||
</div>
|
||||
</div>
|
||||
<div class="grid_rows even">
|
||||
<div class="grid_rows odd">
|
||||
<div class="grid_row_cell" style="width: 20%;">
|
||||
<div class="row_celltitles">
|
||||
<fmt:message key="label.cross.zones"/>:</div>
|
||||
|
|
@ -204,7 +214,7 @@ dictionary = {
|
|||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="grid_rows odd">
|
||||
<div class="grid_rows even">
|
||||
<div class="grid_row_cell" style="width: 20%;">
|
||||
<div class="row_celltitles">
|
||||
<fmt:message key="label.os.type"/>:</div>
|
||||
|
|
@ -216,7 +226,7 @@ dictionary = {
|
|||
</select>
|
||||
</div>
|
||||
</div>
|
||||
<div class="grid_rows even">
|
||||
<div class="grid_rows odd">
|
||||
<div class="grid_row_cell" style="width: 20%;">
|
||||
<div class="row_celltitles">
|
||||
<fmt:message key="label.account"/>:</div>
|
||||
|
|
@ -226,7 +236,7 @@ dictionary = {
|
|||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="grid_rows odd">
|
||||
<div class="grid_rows even">
|
||||
<div class="grid_row_cell" style="width: 20%;">
|
||||
<div class="row_celltitles">
|
||||
<fmt:message key="label.domain"/>:</div>
|
||||
|
|
@ -236,7 +246,7 @@ dictionary = {
|
|||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="grid_rows even">
|
||||
<div class="grid_rows odd">
|
||||
<div class="grid_row_cell" style="width: 20%;">
|
||||
<div class="row_celltitles">
|
||||
<fmt:message key="label.created"/>:</div>
|
||||
|
|
@ -247,7 +257,7 @@ dictionary = {
|
|||
</div>
|
||||
</div>
|
||||
|
||||
<div class="grid_rows odd">
|
||||
<div class="grid_rows even">
|
||||
<div class="grid_row_cell" style="width: 20%;">
|
||||
<div class="row_celltitles">
|
||||
<fmt:message key="label.status"/>:</div>
|
||||
|
|
@ -257,7 +267,7 @@ dictionary = {
|
|||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="grid_rows even" id="progressbar_container">
|
||||
<div class="grid_rows odd" id="progressbar_container">
|
||||
<div class="grid_row_cell" style="width: 20%;">
|
||||
<div class="row_celltitles">
|
||||
<fmt:message key="label.download.progress"/>:</div>
|
||||
|
|
@ -393,7 +403,14 @@ dictionary = {
|
|||
<label for="add_template_format"><fmt:message key="label.format"/>:</label>
|
||||
<select class="select" name="add_template_format" id="add_template_format">
|
||||
</select>
|
||||
</li>
|
||||
</li>
|
||||
<li>
|
||||
<label><fmt:message key="extractable"/>:</label>
|
||||
<select class="select" id="isextractable">
|
||||
<option value="false"><fmt:message key="label.no"/></option>
|
||||
<option value="true"><fmt:message key="label.yes"/></option>
|
||||
</select>
|
||||
</li>
|
||||
<li>
|
||||
<label><fmt:message key="label.password.enabled"/>:</label>
|
||||
<select class="select" id="add_template_password">
|
||||
|
|
|
|||
|
|
@ -129,27 +129,47 @@ function afterLoadTemplateJSP() {
|
|||
if (!isValid) return;
|
||||
|
||||
thisDialog.dialog("close");
|
||||
|
||||
var name = trim(thisDialog.find("#add_template_name").val());
|
||||
var desc = trim(thisDialog.find("#add_template_display_text").val());
|
||||
var url = trim(thisDialog.find("#add_template_url").val());
|
||||
var zoneId = thisDialog.find("#add_template_zone").val();
|
||||
var format = thisDialog.find("#add_template_format").val();
|
||||
var password = thisDialog.find("#add_template_password").val();
|
||||
var isPublic = thisDialog.find("#add_template_public").val();
|
||||
var osType = thisDialog.find("#add_template_os_type").val();
|
||||
var hypervisor = thisDialog.find("#add_template_hypervisor").val();
|
||||
|
||||
var array1 = [];
|
||||
var name = trim(thisDialog.find("#add_template_name").val());
|
||||
array1.push("&name="+todb(name));
|
||||
|
||||
var moreCriteria = [];
|
||||
var desc = trim(thisDialog.find("#add_template_display_text").val());
|
||||
array1.push("&displayText="+todb(desc));
|
||||
|
||||
var url = trim(thisDialog.find("#add_template_url").val());
|
||||
array1.push("&url="+todb(url));
|
||||
|
||||
var zoneId = thisDialog.find("#add_template_zone").val();
|
||||
array1.push("&zoneid="+zoneId);
|
||||
|
||||
var format = thisDialog.find("#add_template_format").val();
|
||||
array1.push("&format="+format);
|
||||
|
||||
var isextractable = thisDialog.find("#isextractable").val();
|
||||
array1.push("&isextractable="+isextractable);
|
||||
|
||||
var password = thisDialog.find("#add_template_password").val();
|
||||
array1.push("&passwordEnabled="+password);
|
||||
|
||||
var isPublic = thisDialog.find("#add_template_public").val();
|
||||
array1.push("&ispublic="+isPublic);
|
||||
|
||||
var osType = thisDialog.find("#add_template_os_type").val();
|
||||
array1.push("&osTypeId="+osType);
|
||||
|
||||
var hypervisor = thisDialog.find("#add_template_hypervisor").val();
|
||||
array1.push("&hypervisor="+hypervisor);
|
||||
|
||||
if(thisDialog.find("#add_template_featured_container").css("display")!="none") {
|
||||
var isFeatured = thisDialog.find("#add_template_featured").val();
|
||||
moreCriteria.push("&isfeatured="+isFeatured);
|
||||
array1.push("&isfeatured="+isFeatured);
|
||||
}
|
||||
|
||||
var $midmenuItem1 = beforeAddingMidMenuItem() ;
|
||||
|
||||
$.ajax({
|
||||
data: createURL("command=registerTemplate&name="+todb(name)+"&displayText="+todb(desc)+"&url="+todb(url)+"&zoneid="+zoneId+"&ispublic="+isPublic+moreCriteria.join("")+"&format="+format+"&passwordEnabled="+password+"&osTypeId="+osType+"&hypervisor="+hypervisor+""),
|
||||
data: createURL("command=registerTemplate" + array1.join("")),
|
||||
dataType: "json",
|
||||
success: function(json) {
|
||||
var items = json.registertemplateresponse.template;
|
||||
|
|
@ -432,6 +452,8 @@ function templateJsonToDetailsTab() {
|
|||
$thisTab.find("#size").text(convertBytes(parseInt(jsonObj.size)));
|
||||
else
|
||||
$thisTab.find("#size").text("");
|
||||
|
||||
setBooleanReadField(jsonObj.isextractable, $thisTab.find("#isextractable"));
|
||||
|
||||
setBooleanReadField(jsonObj.passwordenabled, $thisTab.find("#passwordenabled"));
|
||||
setBooleanEditField(jsonObj.passwordenabled, $thisTab.find("#passwordenabled_edit"));
|
||||
|
|
|
|||
Loading…
Reference in New Issue