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

bug 5916: ISO will now display os type and allow that to be editted. 

- Fixed other display issues with iso and template details.
This commit is contained in:
will 2010-11-07 15:14:41 -08:00
parent 7bc8948b0e
commit 3c932bb4fc
4 changed files with 29 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ui/jsp/instance.jsp
View File

@ -1063,7 +1063,7 @@
</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">
<%=t.t("Created")%>:</div>

16
ui/jsp/iso.jsp
View File

@ -152,7 +152,19 @@
</div>
</div>
</div>
<div class="grid_rows even">
<div class="grid_rows even">
<div class="grid_row_cell" style="width: 20%;">
<div class="row_celltitles">
<%=t.t("OS.Type")%>:</div>
</div>
<div class="grid_row_cell" style="width: 79%;">
<div class="row_celltitles" id="ostypename">
</div>
<select class="select" id="ostypename_edit" style="width: 202px; display: none;">
</select>
</div>
</div>
<div class="grid_rows odd">
<div class="grid_row_cell" style="width: 20%;">
<div class="row_celltitles">
<%=t.t("Account")%>:</div>
@ -162,7 +174,7 @@
</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">
<%=t.t("Domain")%>:</div>

2
ui/jsp/template.jsp
View File

@ -203,7 +203,7 @@
</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">
<%=t.t("Created")%>:</div>

18
ui/scripts/cloud.core.iso.js
View File

@ -233,7 +233,8 @@ function isoJsonToDetailsTab() {
$thisTab.find("#displaytext").text(fromdb(jsonObj.displaytext));
$thisTab.find("#displaytext_edit").val(fromdb(jsonObj.displaytext));
$thisTab.find("#ostypename").text(fromdb(jsonObj.ostypename));
$thisTab.find("#ostypename_edit").val(jsonObj.ostypeid);
$thisTab.find("#account").text(fromdb(jsonObj.account));
$thisTab.find("#domain").text(fromdb(jsonObj.domain));
@ -313,7 +314,9 @@ function isoClearDetailsTab() {
$thisTab.find("#displaytext").text("");
$thisTab.find("#displaytext_edit").val("");
$thisTab.find("#account").text("");
$thisTab.find("#account").text("");
$thisTab.find("#domain").text("");
$thisTab.find("#ostypename_edit").val(null);
$thisTab.find("#size").text("");
$thisTab.find("#status").text("");
$thisTab.find("#bootable").text("");
@ -355,8 +358,8 @@ var isoActionMap = {
function doEditISO($actionLink, $detailsTab, $midmenuItem1) {
//var $detailsTab = $("#right_panel_content #tab_content_details");
var $readonlyFields = $detailsTab.find("#name, #displaytext, #ispublic");
var $editFields = $detailsTab.find("#name_edit, #displaytext_edit, #ispublic_edit");
var $readonlyFields = $detailsTab.find("#name, #displaytext, #ispublic, #ostypename");
var $editFields = $detailsTab.find("#name_edit, #displaytext_edit, #ispublic_edit, #ostypename_edit");
$readonlyFields.hide();
$editFields.show();
@ -389,7 +392,12 @@ function doEditISO2($actionLink, $detailsTab, $midmenuItem1, $readonlyFields, $e
array1.push("&id="+id);
var name = $detailsTab.find("#name_edit").val();
array1.push("&name="+todb(name));
array1.push("&name="+todb(name));
var oldOsTypeId = jsonObj.ostypeid;
var newOsTypeId = $detailsTab.find("#ostypename_edit").val();
if(newOsTypeId != oldOsTypeId)
array1.push("&ostypeid="+newOsTypeId);
var displaytext = $detailsTab.find("#displaytext_edit").val();
array1.push("&displayText="+todb(displaytext));