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:
will 2010-10-27 18:13:54 -07:00
parent b59c3f7924 f26f40c049
commit ff382fb364
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ui/new/scripts/cloud.core2.js
View File

@ -858,7 +858,7 @@ function listMidMenuItems2(commandString, jsonResponse1, jsonResponse2, toMidmen
enableMultipleSelectionInMidMenu();
else
disableMultipleSelectionInMidMenu();
var count = 0;
$.ajax({
cache: false,
@ -867,7 +867,7 @@ function listMidMenuItems2(commandString, jsonResponse1, jsonResponse2, toMidmen
async: false,
success: function(json) {
selectedItemsInMidMenu = {};
var items = json[jsonResponse1][jsonResponse2];
var items = json[jsonResponse1][jsonResponse2];
if(items != null && items.length > 0) {
for(var i=0; i<items.length;i++) {
var $midmenuItem1 = $("#midmenu_item").clone();

10
ui/new/scripts/cloud.core2.resource.js
View File

@ -642,7 +642,10 @@ function hostGetMidmenuId(jsonObj) {
function hostToMidmenu(jsonObj, $midmenuItem1) {
$midmenuItem1.attr("id", hostGetMidmenuId(jsonObj));
$midmenuItem1.data("jsonObj", jsonObj);
$iconContainer.find("#icon").attr("src", "images/midmenuicon_host.png");
var $iconContainer = $midmenuItem1.find("#icon_container").show();
$iconContainer.find("#icon").attr("src", "images/midmenuicon_host.png");
$midmenuItem1.find("#first_row").text(fromdb(jsonObj.name).substring(0,25));
$midmenuItem1.find("#second_row").text(jsonObj.ipaddress.substring(0,25));
}
@ -778,7 +781,10 @@ function primarystorageGetMidmenuId(jsonObj) {
function primarystorageToMidmenu(jsonObj, $midmenuItem1) {
$midmenuItem1.attr("id", primarystorageGetMidmenuId(jsonObj));
$midmenuItem1.data("jsonObj", jsonObj);
$iconContainer.find("#icon").attr("src", "images/midmenuicon_primarystorage.png");
var $iconContainer = $midmenuItem1.find("#icon_container").show();
$iconContainer.find("#icon").attr("src", "images/midmenuicon_primarystorage.png");
$midmenuItem1.find("#first_row").text(fromdb(jsonObj.name).substring(0,25));
$midmenuItem1.find("#second_row").text(jsonObj.ipaddress.substring(0,25));
}