etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

bug 10631: cloudStack - Instance page - Create Template from VM - add Image Directory input field.

This commit is contained in:
Jessica Wang 2011-07-27 11:30:44 -07:00
parent 6c493bfb82
commit 105edff968
6 changed files with 46 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
client/WEB-INF/classes/resources/messages.properties
View File

@ -4,6 +4,8 @@
#Labels
image.directory=Image Directory
label.action.create.template.from.vm=Create Template from VM
label.action.create.template.from.volume=Create Template from Volume

2
client/WEB-INF/classes/resources/messages_es.properties
View File

@ -4,6 +4,8 @@
#Labels
image.directory=Directorio de la imagen
label.action.create.template.from.vm=Crear plantilla de VM
label.action.create.template.from.volume=Crear plantilla de volumen

2
client/WEB-INF/classes/resources/messages_ja.properties
View File

@ -4,6 +4,8 @@
#Labels
image.directory=画像ディレクトリ
label.action.create.template.from.vm=VMからのテンプレートを作成する
label.action.create.template.from.volume=ボリュームからのテンプレートを作成する

2
client/WEB-INF/classes/resources/messages_zh_CN.properties
View File

@ -4,6 +4,8 @@
#Labels
image.directory=图片目录
label.action.create.template.from.vm=创建虚拟机模板
label.action.create.template.from.volume=从卷创建模板

9
ui/jsp/instance.jsp
View File

@ -1456,7 +1456,14 @@ dictionary = {
<option value="false"><fmt:message key="label.no" /></option>
<option value="true"><fmt:message key="label.yes" /></option>
</select>
</li>
</li>
<li id="image_directory_container">
<label>
<fmt:message key="image.directory" />:</label>
<input class="text" type="text" id="image_directory" />
<div id="image_directory_errormsg" class="dialog_formcontent_errormsg" style="display: none;">
</div>
</li>
</ol>
</form>
</div>

43
ui/scripts/cloud.core.instance.js
View File

@ -2524,23 +2524,40 @@ function doCreateTemplateFromVM($actionLink, $detailsTab, $midmenuItem1) {
$dialogCreateTemplate
.dialog('option', 'buttons', {
"Create": function() {
var thisDialog = $(this);
thisDialog.dialog("close");
var $thisDialog = $(this);
// validate values
var isValid = true;
isValid &= validateString("Name", thisDialog.find("#create_template_name"), thisDialog.find("#create_template_name_errormsg"));
isValid &= validateString("Display Text", thisDialog.find("#create_template_desc"), thisDialog.find("#create_template_desc_errormsg"));
if (!isValid) return;
isValid &= validateString("Name", $thisDialog.find("#create_template_name"), $thisDialog.find("#create_template_name_errormsg"));
isValid &= validateString("Display Text", $thisDialog.find("#create_template_desc"), $thisDialog.find("#create_template_desc_errormsg"));
isValid &= validateString("Image Directory", $thisDialog.find("#image_directory"), $thisDialog.find("#image_directory_errormsg"), false); //image directory is required when creating template from VM whose hypervisor is BareMetal
if (!isValid)
return;
var name = trim(thisDialog.find("#create_template_name").val());
var desc = trim(thisDialog.find("#create_template_desc").val());
var osType = thisDialog.find("#create_template_os_type").val();
var isPublic = thisDialog.find("#create_template_public").val();
var password = thisDialog.find("#create_template_password").val();
$thisDialog.dialog("close");
var id = $midmenuItem1.data("jsonObj").id;
var apiCommand = "command=createTemplate&virtualmachineid="+id+"&name="+todb(name)+"&displayText="+todb(desc)+"&osTypeId="+osType+"&isPublic="+isPublic+"&passwordEnabled="+password;
var array1 = [];
var name = $thisDialog.find("#create_template_name").val();
array1.push("&name="+todb(name));
var desc = $thisDialog.find("#create_template_desc").val();
array1.push("&displayText="+todb(desc));
var osType = $thisDialog.find("#create_template_os_type").val();
array1.push("&osTypeId="+osType);
var isPublic = $thisDialog.find("#create_template_public").val();
array1.push("&isPublic="+isPublic);
var password = $thisDialog.find("#create_template_password").val();
array1.push("&passwordEnabled="+password);
var imageDirectory = $thisDialog.find("#image_directory").val();
array1.push("&url="+todb(imageDirectory));
var id = $midmenuItem1.data("jsonObj").id;
var apiCommand = "command=createTemplate&virtualmachineid="+id+array1.join("");
doActionToTab(id, $actionLink, apiCommand, $midmenuItem1, $detailsTab);
},
"Cancel": function() {