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

Merge branch 'master' of ssh://git.cloud.com/var/lib/git/cloudstack-oss

This commit is contained in:
Kelven Yang 2010-08-17 15:16:49 -07:00
parent 53097c67f5 1849d4a6b1
commit 627e65e102
3 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
.gitignore vendored
View File

@ -1,14 +1,15 @@
build/build.number
bin
bin/
cloudstack-proprietary
.lock-wscript
artifacts
.waf-*
waf-*
target
override
override/
.metadata
dist
*~
*.bak
cloud-*.tar.bz2
*.log

9
ui/content/tab_storage.html
View File

@ -1516,7 +1516,14 @@
<label>OS Type:</label>
<select class="select" id="os_type">
</select>
</li>
</li>
<li>
<label>Password Enabled?:</label>
<select class="select" id="password">
<option value="false">No</option>
<option value="true">Yes</option>
</select>
</li>
</ol>
</form>
</div>

12
ui/scripts/cloud.core.storage.js
View File

@ -16,7 +16,7 @@
*
*/
// Version: 1.9.1.452
// Version: @VERSION@
function showStorageTab(domainId, targetTab) {
var currentSubMenu;
@ -531,7 +531,8 @@ function showStorageTab(domainId, targetTab) {
var name = thisDialog.find("#name").val();
var displayText = thisDialog.find("#display_text").val();
var osTypeId = thisDialog.find("#os_type").val();
var osTypeId = thisDialog.find("#os_type").val();
var password = thisDialog.find("#password").val();
thisDialog.dialog("close");
var loadingImg = template.find(".adding_loading");
@ -541,7 +542,7 @@ function showStorageTab(domainId, targetTab) {
rowContainer.hide();
$.ajax({
data: createURL("command=createTemplate&snapshotid="+snapshotId+"&name="+name+"&displaytext="+displayText+"&ostypeid="+osTypeId+"&response=json"),
data: createURL("command=createTemplate&snapshotid="+snapshotId+"&name="+name+"&displaytext="+displayText+"&ostypeid="+osTypeId+"&passwordEnabled="+password+"&response=json"),
dataType: "json",
success: function(json) {
var jobId = json.createtemplateresponse.jobid;
@ -1596,7 +1597,8 @@ function showStorageTab(domainId, targetTab) {
var name = thisDialog.find("#name").val();
var displayText = thisDialog.find("#display_text").val();
var osTypeId = thisDialog.find("#os_type").val();
var osTypeId = thisDialog.find("#os_type").val();
var password = thisDialog.find("#password").val();
thisDialog.dialog("close");
var loadingImg = template.find(".adding_loading");
@ -1606,7 +1608,7 @@ function showStorageTab(domainId, targetTab) {
rowContainer.hide();
$.ajax({
data: createURL("command=createTemplate&snapshotid="+snapshotId+"&name="+name+"&displaytext="+displayText+"&ostypeid="+osTypeId+"&response=json"),
data: createURL("command=createTemplate&snapshotid="+snapshotId+"&name="+name+"&displaytext="+displayText+"&ostypeid="+osTypeId+"&passwordEnabled="+password+"&response=json"),
dataType: "json",
success: function(json) {
var jobId = json.createtemplateresponse.jobid;