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

bug 5883: added domain to both templates and iso details

This commit is contained in:
will 2010-11-07 11:16:24 -08:00
parent ddfbfc1048
commit e5ae04f417
4 changed files with 23 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ui/jsp/iso.jsp
View File

@ -161,6 +161,16 @@
<div class="row_celltitles" id="account">
</div>
</div>
</div>
<div class="grid_rows odd">
<div class="grid_row_cell" style="width: 20%;">
<div class="row_celltitles">
<%=t.t("Domain")%>:</div>
</div>
<div class="grid_row_cell" style="width: 79%;">
<div class="row_celltitles" id="domain">
</div>
</div>
</div>
<div class="grid_rows odd">
<div class="grid_row_cell" style="width: 20%;">

10
ui/jsp/template.jsp
View File

@ -193,6 +193,16 @@
</div>
</div>
</div>
<div class="grid_rows odd">
<div class="grid_row_cell" style="width: 20%;">
<div class="row_celltitles">
<%=t.t("Domain")%>:</div>
</div>
<div class="grid_row_cell" style="width: 79%;">
<div class="row_celltitles" id="domain">
</div>
</div>
</div>
<div class="grid_rows odd">
<div class="grid_row_cell" style="width: 20%;">
<div class="row_celltitles">

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

@ -234,7 +234,8 @@ function isoJsonToDetailsTab() {
$thisTab.find("#displaytext").text(fromdb(jsonObj.displaytext));
$thisTab.find("#displaytext_edit").val(fromdb(jsonObj.displaytext));
$thisTab.find("#account").text(fromdb(jsonObj.account));
$thisTab.find("#account").text(fromdb(jsonObj.account));
$thisTab.find("#domain").text(fromdb(jsonObj.domain));
var status = "Ready";
if (jsonObj.isready == "false")

2
ui/scripts/cloud.core.template.js
View File

@ -274,7 +274,7 @@ function templateJsonToDetailsTab() {
$thisTab.find("#ostypename_edit").val(jsonObj.ostypeid);
$thisTab.find("#account").text(fromdb(jsonObj.account));
$thisTab.find("#domain").text(fromdb(jsonObj.domain));
setDateField(jsonObj.created, $thisTab.find("#created"));
//actions ***