mirror of
https://github.com/OpenNebula/one.git
synced 2025-03-21 14:50:08 +03:00
Merge pull request #136 from juanmont/B-4800
B #4800 Sunstone show IP on main info page
This commit is contained in:
commit
e54dd154c1
@ -77,6 +77,8 @@ define(function(require) {
|
||||
var hostnameHTML = OpenNebula.VM.hostnameStrLink(this.element);
|
||||
var vrouterHTML = '--';
|
||||
|
||||
var IP = OpenNebula.VM.ipsStr(this.element);
|
||||
|
||||
if (this.element.TEMPLATE.VROUTER_ID != undefined){
|
||||
vrouterHTML = Navigation.link(
|
||||
OpenNebula.VirtualRouter.getName(this.element.TEMPLATE.VROUTER_ID),
|
||||
@ -122,6 +124,7 @@ define(function(require) {
|
||||
'hostnameHTML': hostnameHTML,
|
||||
'prettyStartTime': prettyStartTime,
|
||||
'deployId': deployId,
|
||||
'IP': IP,
|
||||
'resched': resched,
|
||||
'permissionsTableHTML': permissionsTableHTML,
|
||||
'templateTableHTML': templateTableHTML,
|
||||
@ -133,7 +136,6 @@ define(function(require) {
|
||||
function _setup(context) {
|
||||
RenameTr.setup(TAB_ID, RESOURCE, this.element.ID, context);
|
||||
PermissionsTable.setup(TAB_ID, RESOURCE, this.element, context);
|
||||
|
||||
// Get rid of the unwanted (for show) SCHED_* keys
|
||||
var that = this;
|
||||
var strippedTemplate = {};
|
||||
|
@ -43,6 +43,13 @@
|
||||
<td class="value_td">{{{hostnameHTML}}}</td>
|
||||
<td></td>
|
||||
</tr>
|
||||
|
||||
<tr>
|
||||
<td class="key_td">{{tr "IP"}}</td>
|
||||
<td class="value_td">{{{IP}}}</td>
|
||||
<td></td>
|
||||
</tr>
|
||||
|
||||
<tr>
|
||||
<td class="key_td">{{tr "Start time"}}</td>
|
||||
<td class="value_td">{{prettyStartTime}}</td>
|
||||
|
@ -130,6 +130,7 @@ define(function(require) {
|
||||
];
|
||||
}
|
||||
|
||||
|
||||
function _emptyElementArray(vmId) {
|
||||
return [
|
||||
'<input class="check_item" type="checkbox" id="' + RESOURCE.toLowerCase() + '_' +
|
||||
|
Loading…
x
Reference in New Issue
Block a user