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

bug 14351: Show VM name in PF, instead of UUID

This commit is contained in:
Brian Federle 2012-03-21 10:26:48 -07:00
parent a184660028
commit 6ef16cb79f
2 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ui/scripts/network.js
View File

@ -2239,6 +2239,8 @@
$(portForwardingData).each(function() {
var item = this;
item._itemName = 'instancename';
$.ajax({
url: createURL('listVirtualMachines'),
dataType: 'json',

14
ui/scripts/ui/widgets/multiEdit.js
View File

@ -22,6 +22,7 @@
if (options.ignoreEmptyFields && !data[fieldName]) {
return true;
}
var $td = $('<td>').addClass(fieldName).appendTo($tr);
var $input, val;
var $addButton = $multi.find('form .button.add-vm:not(.custom-action)').clone();
@ -80,6 +81,9 @@
});
};
var itemName = data._itemName ?
itemData[0][data._itemName] : itemData[0].name;
if ($multi.find('th,td').filter(function() {
return $(this).attr('rel') == fieldName;
}).is(':hidden')) return true;
@ -128,14 +132,16 @@
} else {
// Show VM data
$td.html(options.multipleAdd ?
itemData.length + ' VMs' : itemData[0].name);
itemData.length + ' VMs' : itemName);
$td.click(function() {
var $browser = $(this).closest('.detail-view').data('view-args').$browser;
if (options.multipleAdd) {
_medit.multiItem.details(itemData, $browser);
} else {
_medit.details(itemData[0], $browser, { context: options.context });
_medit.details(itemData[0], $browser, {
context: options.context, itemName: itemName
});
}
});
}
@ -468,11 +474,11 @@
detailViewArgs.actions = null;
detailViewArgs.$browser = $browser;
detailViewArgs.id = data.id;
detailViewArgs.jsonObj = data[0];
detailViewArgs.jsonObj = data;
detailViewArgs.context = options.context;
$browser.cloudBrowser('addPanel', {
title: data.name,
title: options.itemName ? options.itemName : data.name,
complete: function($newPanel) {
$newPanel.detailView(detailViewArgs);
}