diff --git a/ui/new/scripts/cloud.core2.account.js b/ui/new/scripts/cloud.core2.account.js index cccb014f3ac..1143b99bcf4 100644 --- a/ui/new/scripts/cloud.core2.account.js +++ b/ui/new/scripts/cloud.core2.account.js @@ -42,12 +42,12 @@ function accountToMidmenu(jsonObj, $midmenuItem1) { $midmenuItem1.find("#second_row").text(fromdb(jsonObj.domain).substring(0,25)); } -function accountToRigntPanel($midmenuItem) { - var jsonObj = $midmenuItem.data("jsonObj"); - accountJsonToDetailsTab(jsonObj); +function accountToRightPanel($midmenuItem1) { + accountJsonToDetailsTab($midmenuItem1); } -function accountJsonToDetailsTab(jsonObj) { +function accountJsonToDetailsTab($midmenuItem1) { + var jsonObj = $midmenuItem1.data("jsonObj"); var $detailsTab = $("#right_panel_content #tab_content_details"); $detailsTab.data("jsonObj", jsonObj); $detailsTab.find("#grid_header_title").text(fromdb(jsonObj.name)); @@ -65,21 +65,20 @@ function accountJsonToDetailsTab(jsonObj) { var $actionMenu = $("#right_panel_content #tab_content_details #action_link #action_menu"); $actionMenu.find("#action_list").empty(); var noAvailableActions = true; - - var midmenuItemId = getMidmenuId(jsonObj); + if(jsonObj.id != systemAccountId && jsonObj.id != adminAccountId) { if (jsonObj.accounttype == roleTypeUser || jsonObj.accounttype == roleTypeDomainAdmin) { - buildActionLinkForDetailsTab("Resource limits", accountActionMap, $actionMenu, midmenuItemId); + buildActionLinkForDetailsTab("Resource limits", accountActionMap, $actionMenu, $midmenuItem1); noAvailableActions = false; } if(jsonObj.state == "enabled") { - buildActionLinkForDetailsTab("Disable account", accountActionMap, $actionMenu, midmenuItemId); - buildActionLinkForDetailsTab("Lock account", accountActionMap, $actionMenu, midmenuItemId); + buildActionLinkForDetailsTab("Disable account", accountActionMap, $actionMenu, $midmenuItem1); + buildActionLinkForDetailsTab("Lock account", accountActionMap, $actionMenu, $midmenuItem1); noAvailableActions = false; } else if(jsonObj.state == "disabled" || jsonObj.state == "locked") { - buildActionLinkForDetailsTab("Enable account", accountActionMap, $actionMenu, midmenuItemId); + buildActionLinkForDetailsTab("Enable account", accountActionMap, $actionMenu, $midmenuItem1); noAvailableActions = false; } } @@ -100,7 +99,7 @@ var accountActionMap = { asyncJobResponse: "disableaccountresponse", dialogBeforeActionFn : doDisableAccount, inProcessText: "Disabling account....", - afterActionSeccessFn: function(json, id, midmenuItemId) { + afterActionSeccessFn: function(json, $midmenuItem1, id) { //Get embedded object from listVolume API until bug 6482("enableAccount, disableAccount, lockAccount should return an embedded object") is fixed. var jsonObj; $.ajax({ @@ -112,8 +111,8 @@ var accountActionMap = { } }); - accountToMidmenu(jsonObj, $("#"+midmenuItemId)); - accountJsonToDetailsTab(jsonObj); + accountToMidmenu(jsonObj, $midmenuItem1); + accountJsonToDetailsTab($midmenuItem1); } } , @@ -121,7 +120,7 @@ var accountActionMap = { isAsyncJob: false, dialogBeforeActionFn : doLockAccount, inProcessText: "Locking account....", - afterActionSeccessFn: function(json, id, midmenuItemId) { + afterActionSeccessFn: function(json, $midmenuItem1, id) { //Get embedded object from listVolume API until bug 6482("enableAccount, disableAccount, lockAccount should return an embedded object") is fixed. var jsonObj; $.ajax({ @@ -133,8 +132,8 @@ var accountActionMap = { } }); - accountToMidmenu(jsonObj, $("#"+midmenuItemId)); - accountJsonToDetailsTab(jsonObj); + accountToMidmenu(jsonObj, $midmenuItem1); + accountJsonToDetailsTab($midmenuItem1); } } , @@ -142,7 +141,7 @@ var accountActionMap = { isAsyncJob: false, dialogBeforeActionFn : doEnableAccount, inProcessText: "Enabling account....", - afterActionSeccessFn: function(json, id, midmenuItemId) { + afterActionSeccessFn: function(json, $midmenuItem1, id) { //Get embedded object from listVolume API until bug 6482("enableAccount, disableAccount, lockAccount should return an embedded object") is fixed. var jsonObj; $.ajax({ @@ -154,8 +153,8 @@ var accountActionMap = { } }); - accountToMidmenu(jsonObj, $("#"+midmenuItemId)); - accountJsonToDetailsTab(jsonObj); + accountToMidmenu(jsonObj, $midmenuItem1); + accountJsonToDetailsTab($midmenuItem1); } } }; @@ -169,7 +168,7 @@ function updateResourceLimit(domainId, account, type, max) { }); } -function doResourceLimits () { +function doResourceLimits($actionLink, $detailsTab, $midmenuItem1) { var $detailsTab = $("#right_panel_content #tab_content_details"); var jsonObj = $detailsTab.data("jsonObj"); var domainId = jsonObj.domainid; @@ -251,7 +250,7 @@ function doResourceLimits () { }); } -function doDisableAccount($actionLink, $detailsTab, midmenuItemId) { +function doDisableAccount($actionLink, $detailsTab, $midmenuItem1) { var jsonObj = $detailsTab.data("jsonObj"); var id = jsonObj.id; @@ -260,7 +259,7 @@ function doDisableAccount($actionLink, $detailsTab, midmenuItemId) { "Yes": function() { $(this).dialog("close"); var apiCommand = "command=disableAccount&account="+jsonObj.name+"&domainId="+jsonObj.domainid; - doActionToDetailsTab(id, $actionLink, apiCommand, midmenuItemId) ; + doActionToDetailsTab(id, $actionLink, apiCommand, $midmenuItem1) ; }, "Cancel": function() { $(this).dialog("close"); @@ -268,7 +267,7 @@ function doDisableAccount($actionLink, $detailsTab, midmenuItemId) { }).dialog("open"); } -function doLockAccount($actionLink, $detailsTab, midmenuItemId) { +function doLockAccount($actionLink, $detailsTab, $midmenuItem1) { var jsonObj = $detailsTab.data("jsonObj"); $("#dialog_lock_account") @@ -276,7 +275,7 @@ function doLockAccount($actionLink, $detailsTab, midmenuItemId) { "Yes": function() { $(this).dialog("close"); var apiCommand = "command=lockAccount&account="+jsonObj.name+"&domainId="+jsonObj.domainid; - doActionToDetailsTab(jsonObj.id, $actionLink, apiCommand, midmenuItemId); + doActionToDetailsTab(jsonObj.id, $actionLink, apiCommand, $midmenuItem1); }, "Cancel": function() { $(this).dialog("close"); @@ -284,7 +283,7 @@ function doLockAccount($actionLink, $detailsTab, midmenuItemId) { }).dialog("open"); } -function doEnableAccount($actionLink, $detailsTab, midmenuItemId) { +function doEnableAccount($actionLink, $detailsTab, $midmenuItem1) { var jsonObj = $detailsTab.data("jsonObj"); $("#dialog_enable_account") @@ -292,7 +291,7 @@ function doEnableAccount($actionLink, $detailsTab, midmenuItemId) { "Yes": function() { $(this).dialog("close"); var apiCommand = "command=enableAccount&account="+jsonObj.name+"&domainId="+jsonObj.domainid; - doActionToDetailsTab(jsonObj.id, $actionLink, apiCommand, midmenuItemId); + doActionToDetailsTab(jsonObj.id, $actionLink, apiCommand, $midmenuItem1); }, "Cancel": function() { $(this).dialog("close"); diff --git a/ui/new/scripts/cloud.core2.alert.js b/ui/new/scripts/cloud.core2.alert.js index b133bfc381b..d2296de4fd2 100644 --- a/ui/new/scripts/cloud.core2.alert.js +++ b/ui/new/scripts/cloud.core2.alert.js @@ -27,12 +27,12 @@ function alertToMidmenu(jsonObj, $midmenuItem1) { $midmenuItem1.find("#second_row").text(jsonObj.type.substring(0,25)); } -function alertToRigntPanel($midmenuItem) { - var jsonObj = $midmenuItem.data("jsonObj"); - alertJsonToDetailsTab(jsonObj); +function alertToRigntPanel($midmenuItem1) { + alertJsonToDetailsTab($midmenuItem1); } -function alertJsonToDetailsTab(jsonObj) { +function alertJsonToDetailsTab($midmenuItem1) { + var jsonObj = $midmenuItem1.data("jsonObj"); var $detailsTab = $("#right_panel_content #tab_content_details"); $detailsTab.data("jsonObj", jsonObj); diff --git a/ui/new/scripts/cloud.core2.diskoffering.js b/ui/new/scripts/cloud.core2.diskoffering.js index ef31b61f7a0..b50a4c9a353 100644 --- a/ui/new/scripts/cloud.core2.diskoffering.js +++ b/ui/new/scripts/cloud.core2.diskoffering.js @@ -141,11 +141,11 @@ function diskOfferingToMidmenu(jsonObj, $midmenuItem1) { } function diskOfferingToRigntPanel($midmenuItem1) { - var jsonObj = $midmenuItem1.data("jsonObj"); - diskOfferingJsonToDetailsTab(jsonObj); + diskOfferingJsonToDetailsTab($midmenuItem1); } -function diskOfferingJsonToDetailsTab(jsonObj) { +function diskOfferingJsonToDetailsTab($midmenuItem1) { + var jsonObj = $midmenuItem1.data("jsonObj"); var $detailsTab = $("#right_panel_content #tab_content_details"); $detailsTab.data("jsonObj", jsonObj); $detailsTab.find("#id").text(jsonObj.id); @@ -162,9 +162,8 @@ function diskOfferingJsonToDetailsTab(jsonObj) { //actions *** var $actionMenu = $("#right_panel_content #tab_content_details #action_link #action_menu"); - $actionMenu.find("#action_list").empty(); - var midmenuItemId = getMidmenuId(jsonObj); - buildActionLinkForDetailsTab("Delete Disk Offering", diskOfferingActionMap, $actionMenu, midmenuItemId); + $actionMenu.find("#action_list").empty(); + buildActionLinkForDetailsTab("Delete Disk Offering", diskOfferingActionMap, $actionMenu, $midmenuItem1); } function diskOfferingClearRightPanel() { @@ -192,8 +191,8 @@ var diskOfferingActionMap = { api: "deleteDiskOffering", isAsyncJob: false, inProcessText: "Deleting disk offering....", - afterActionSeccessFn: function(json, id, midmenuItemId) { - $("#"+midmenuItemId).remove(); + afterActionSeccessFn: function(json, $midmenuItem1, id) { + $midmenuItem1.remove(); clearRightPanel(); diskOfferingClearRightPanel(); } diff --git a/ui/new/scripts/cloud.core2.event.js b/ui/new/scripts/cloud.core2.event.js index 05a69ac0303..911a13b5ab7 100644 --- a/ui/new/scripts/cloud.core2.event.js +++ b/ui/new/scripts/cloud.core2.event.js @@ -36,12 +36,12 @@ function eventToMidmenu(jsonObj, $midmenuItem1) { $midmenuItem1.find("#second_row").text(jsonObj.type.substring(0,25)); } -function eventToRigntPanel($midmenuItem) { - var jsonObj = $midmenuItem.data("jsonObj"); - eventJsonToDetailsTab(jsonObj); +function eventToRigntPanel($midmenuItem1) { + eventJsonToDetailsTab($midmenuItem1); } -function eventJsonToDetailsTab(jsonObj) { +function eventJsonToDetailsTab($midmenuItem1) { + var jsonObj = $midmenuItem1.data("jsonObj"); var $detailsTab = $("#right_panel_content #tab_content_details"); $detailsTab.data("jsonObj", jsonObj); diff --git a/ui/new/scripts/cloud.core2.globalsetting.js b/ui/new/scripts/cloud.core2.globalsetting.js index 731898437fa..6a821efa4e8 100644 --- a/ui/new/scripts/cloud.core2.globalsetting.js +++ b/ui/new/scripts/cloud.core2.globalsetting.js @@ -81,12 +81,12 @@ function globalSettingToMidmenu(jsonObj, $midmenuItem1) { $midmenuItem1.find("#second_row").text(fromdb(jsonObj.value).substring(0,25)); } -function globalSettingToRigntPanel($midmenuItem) { - var jsonObj = $midmenuItem.data("jsonObj"); - globalSettingJsonToDetailsTab(jsonObj); +function globalSettingToRigntPanel($midmenuItem1) { + globalSettingJsonToDetailsTab($midmenuItem1); } -function globalSettingJsonToDetailsTab(jsonObj) { +function globalSettingJsonToDetailsTab($midmenuItem1) { + var jsonObj = $midmenuItem1.data("jsonObj"); var $detailsTab = $("#right_panel_content #tab_content_details"); $detailsTab.data("jsonObj", jsonObj); $detailsTab.find("#name").text(fromdb(jsonObj.name)); diff --git a/ui/new/scripts/cloud.core2.init.js b/ui/new/scripts/cloud.core2.init.js index 9af47083156..1a634a72aef 100644 --- a/ui/new/scripts/cloud.core2.init.js +++ b/ui/new/scripts/cloud.core2.init.js @@ -51,7 +51,7 @@ $(document).ready(function() { }); $("#leftmenu_account").bind("click", function(event) { selectLeftMenu($(this)); - listMidMenuItems("listAccounts", "listaccountsresponse", "account", "jsp/account.jsp", afterLoadAccountJSP, accountToMidmenu, accountToRigntPanel, getMidmenuId, false); + listMidMenuItems("listAccounts", "listaccountsresponse", "account", "jsp/account.jsp", afterLoadAccountJSP, accountToMidmenu, accountToRightPanel, getMidmenuId, false); return false; }); $("#leftmenu_events").bind("click", function(event) { @@ -70,17 +70,17 @@ $(document).ready(function() { bindAndListMidMenuItems($("#leftmenu_volume"), "listVolumes", "listvolumesresponse", "volume", "jsp/volume.jsp", afterLoadVolumeJSP, volumeToMidmenu, volumeToRigntPanel, getMidmenuId, false); bindAndListMidMenuItems($("#leftmenu_snapshot"), "listSnapshots", "listsnapshotsresponse", "snapshot", "jsp/snapshot.jsp", afterLoadSnapshotJSP, snapshotToMidmenu, snapshotToRigntPanel, getMidmenuId, false); bindAndListMidMenuItems($("#leftmenu_ip"), "listPublicIpAddresses", "listpublicipaddressesresponse", "publicipaddress", "jsp/ipaddress.jsp", afterLoadIpJSP, ipToMidmenu, ipToRigntPanel, ipGetMidmenuId, false); - //bindAndListMidMenuItems("leftmenu_router", "listRouters", "listroutersresponse", "router", "jsp/router.jsp", afterLoadRouterJSP, routerToMidmenu, routerToRigntPanel, getMidmenuId, false); + //bindAndListMidMenuItems("leftmenu_router", "listRouters", "listroutersresponse", "router", "jsp/router.jsp", afterLoadRouterJSP, routerToMidmenu, routerToRightPanel, getMidmenuId, false); bindAndListMidMenuItems($("#leftmenu_submenu_my_template"), "listTemplates&templatefilter=self", "listtemplatesresponse", "template", "jsp/template.jsp", afterLoadTemplateJSP, templateToMidmenu, templateToRigntPanel, templateGetMidmenuId, false); bindAndListMidMenuItems($("#leftmenu_submenu_featured_template"), "listTemplates&templatefilter=featured", "listtemplatesresponse", "template", "jsp/template.jsp", afterLoadTemplateJSP, templateToMidmenu, templateToRigntPanel, templateGetMidmenuId, false); bindAndListMidMenuItems($("#leftmenu_submenu_community_template"), "listTemplates&templatefilter=community", "listtemplatesresponse", "template", "jsp/template.jsp", afterLoadTemplateJSP, templateToMidmenu, templateToRigntPanel, templateGetMidmenuId, false); - bindAndListMidMenuItems($("#leftmenu_submenu_my_iso"), "listIsos&isofilter=self", "listisosresponse", "iso", "jsp/iso.jsp", afterLoadIsoJSP, isoToMidmenu, isoToRigntPanel, isoGetMidmenuId, false); - bindAndListMidMenuItems($("#leftmenu_submenu_featured_iso"), "listIsos&isofilter=featured", "listisosresponse", "iso", "jsp/iso.jsp", afterLoadIsoJSP, isoToMidmenu, isoToRigntPanel, isoGetMidmenuId, false); - bindAndListMidMenuItems($("#leftmenu_submenu_community_iso"), "listIsos&isofilter=community", "listisosresponse", "iso", "jsp/iso.jsp", afterLoadIsoJSP, isoToMidmenu, isoToRigntPanel, isoGetMidmenuId, false); + bindAndListMidMenuItems($("#leftmenu_submenu_my_iso"), "listIsos&isofilter=self", "listisosresponse", "iso", "jsp/iso.jsp", afterLoadIsoJSP, isoToMidmenu, isoToRightPanel, isoGetMidmenuId, false); + bindAndListMidMenuItems($("#leftmenu_submenu_featured_iso"), "listIsos&isofilter=featured", "listisosresponse", "iso", "jsp/iso.jsp", afterLoadIsoJSP, isoToMidmenu, isoToRightPanel, isoGetMidmenuId, false); + bindAndListMidMenuItems($("#leftmenu_submenu_community_iso"), "listIsos&isofilter=community", "listisosresponse", "iso", "jsp/iso.jsp", afterLoadIsoJSP, isoToMidmenu, isoToRightPanel, isoGetMidmenuId, false); - bindAndListMidMenuItems($("#leftmenu_service_offering"), "listServiceOfferings", "listserviceofferingsresponse", "serviceoffering", "jsp/serviceoffering.jsp", afterLoadServiceOfferingJSP, serviceOfferingToMidmenu, serviceOfferingToRigntPanel, getMidmenuId, false); + bindAndListMidMenuItems($("#leftmenu_service_offering"), "listServiceOfferings", "listserviceofferingsresponse", "serviceoffering", "jsp/serviceoffering.jsp", afterLoadServiceOfferingJSP, serviceOfferingToMidmenu, serviceOfferingToRightPanel, getMidmenuId, false); bindAndListMidMenuItems($("#leftmenu_disk_offering"), "listDiskOfferings", "listdiskofferingsresponse", "diskoffering", "jsp/diskoffering.jsp", afterLoadDiskOfferingJSP, diskOfferingToMidmenu, diskOfferingToRigntPanel, getMidmenuId, false); bindAndListMidMenuItems($("#leftmenu_global_setting"), "listConfigurations", "listconfigurationsresponse", "configuration", "jsp/globalsetting.jsp", afterLoadGlobalSettingJSP, globalSettingToMidmenu, globalSettingToRigntPanel, globalSettingGetMidmenuId, false); diff --git a/ui/new/scripts/cloud.core2.instance.js b/ui/new/scripts/cloud.core2.instance.js index 08ea853189c..0685e03d8b0 100644 --- a/ui/new/scripts/cloud.core2.instance.js +++ b/ui/new/scripts/cloud.core2.instance.js @@ -1209,16 +1209,16 @@ function vmToMidmenu(jsonObj, $midmenuItem1) { $midmenuItem1.data("toRightPanelFn", vmToRightPanel); } -function vmToRightPanel($midmenuItem) { - var jsonObj = $midmenuItem.data("jsonObj"); +function vmToRightPanel($midmenuItem1) { + var jsonObj = $midmenuItem1.data("jsonObj"); var vmName = getVmName(jsonObj.name, jsonObj.displayname); $("right_panel_header").find("#vm_name").text(vmName); var $rightPanelContent = $("#right_panel_content"); - if($midmenuItem.find("#info_icon").css("display") != "none") { - $rightPanelContent.find("#after_action_info").text($midmenuItem.data("afterActionInfo")); - if($midmenuItem.find("#info_icon").hasClass("error")) + if($midmenuItem1.find("#info_icon").css("display") != "none") { + $rightPanelContent.find("#after_action_info").text($midmenuItem1.data("afterActionInfo")); + if($midmenuItem1.find("#info_icon").hasClass("error")) $rightPanelContent.find("#after_action_info_container").addClass("errorbox"); else $rightPanelContent.find("#after_action_info_container").removeClass("errorbox"); @@ -1229,14 +1229,15 @@ function vmToRightPanel($midmenuItem) { $rightPanelContent.find("#after_action_info_container").hide(); } - vmJsonToDetailsTab(jsonObj, $midmenuItem); + vmJsonToDetailsTab($midmenuItem1); vmJsonToVolumeTab(jsonObj); if (isAdmin() || isDomainAdmin()) vmJsonToRouterTab(jsonObj); } -function vmJsonToDetailsTab(jsonObj, $midmenuItem){ +function vmJsonToDetailsTab($midmenuItem1){ + var jsonObj = $midmenuItem1.data("jsonObj"); var $detailsTab = $("#right_panel_content #tab_content_details"); $detailsTab.data("jsonObj", jsonObj); diff --git a/ui/new/scripts/cloud.core2.ipaddress.js b/ui/new/scripts/cloud.core2.ipaddress.js index a3c8603a3cb..3701b146ce1 100644 --- a/ui/new/scripts/cloud.core2.ipaddress.js +++ b/ui/new/scripts/cloud.core2.ipaddress.js @@ -59,9 +59,9 @@ function afterLoadIpJSP() { data: createURL("command=associateIpAddress&zoneid="+zoneid), dataType: "json", success: function(json) { - var items = json.associateipaddressresponse.publicipaddress; + var item = json.associateipaddressresponse; //$("#dialog_info").html("
The IP address "+items[0].ipaddress+" has been assigned to your account
").dialog("open"); - ipToMidmenu(items[0], $midmenuItem1); + ipToMidmenu(item, $midmenuItem1); bindClickToMidMenu($midmenuItem1, ipToRigntPanel, ipGetMidmenuId); afterAddingMidMenuItem($midmenuItem1, true); @@ -213,7 +213,7 @@ function ipToRigntPanel($midmenuItem1) { var ipObj = $midmenuItem1.data("jsonObj"); //Details tab - ipJsonToDetailsTab(ipObj); + ipJsonToDetailsTab($midmenuItem1); //Port Forwarding tab, Load Balancer tab if(isIpManageable(ipObj.domainid, ipObj.account) == true) { @@ -238,7 +238,8 @@ function ipClearRightPanel() { } //***** Details tab (begin) **************************************************************************************************************** -function ipJsonToDetailsTab(ipObj) { +function ipJsonToDetailsTab($midmenuItem1) { + var ipObj = $midmenuItem1.data("jsonObj"); var $detailsTab = $("#right_panel_content #tab_content_details"); $detailsTab.data("jsonObj", ipObj); @@ -256,10 +257,9 @@ function ipJsonToDetailsTab(ipObj) { var $actionMenu = $("#right_panel_content #tab_content_details #action_link #action_menu"); $actionMenu.find("#action_list").empty(); var noAvailableActions = true; - var midmenuItemId = ipGetMidmenuId(ipObj); - + if(isIpManageable(ipObj.domainid, ipObj.account) == true && ipObj.issourcenat != "true") { - buildActionLinkForDetailsTab("Release IP", ipActionMap, $actionMenu, midmenuItemId); + buildActionLinkForDetailsTab("Release IP", ipActionMap, $actionMenu, $midmenuItem1); noAvailableActions = false; } @@ -310,8 +310,7 @@ var ipActionMap = { isAsyncJob: false, dialogBeforeActionFn : doReleaseIp, inProcessText: "Releasing IP....", - afterActionSeccessFn: function(ipaddress) { - var $midmenuItem1 = $("#"+ipGetMidmenuId2(ipaddress)); + afterActionSeccessFn: function(json, $midmenuItem1, id) { $midmenuItem1.remove(); clearRightPanel(); ipClearRightPanel(); @@ -319,7 +318,7 @@ var ipActionMap = { } } -function doReleaseIp($actionLink, $detailsTab, midmenuItemId) { +function doReleaseIp($actionLink, $detailsTab, $midmenuItem1) { var $detailsTab = $("#right_panel_content #tab_content_details"); var jsonObj = $detailsTab.data("jsonObj"); var ipaddress = jsonObj.ipaddress; @@ -329,7 +328,7 @@ function doReleaseIp($actionLink, $detailsTab, midmenuItemId) { "Confirm": function() { $(this).dialog("close"); var apiCommand = "command=disassociateIpAddress&ipaddress="+ipaddress; - doActionToDetailsTab(ipaddress, $actionLink, apiCommand, midmenuItemId); + doActionToDetailsTab(ipaddress, $actionLink, apiCommand, $midmenuItem1); }, "Cancel": function() { $(this).dialog("close"); diff --git a/ui/new/scripts/cloud.core2.iso.js b/ui/new/scripts/cloud.core2.iso.js index 4d63b077570..f29b7185f75 100644 --- a/ui/new/scripts/cloud.core2.iso.js +++ b/ui/new/scripts/cloud.core2.iso.js @@ -58,14 +58,14 @@ function afterLoadIsoJSP() { success: function(json) { var items = json.registerisoresponse.iso; isoToMidmenu(items[0], $midmenuItem1); - bindClickToMidMenu($midmenuItem1, isoToRigntPanel, isoGetMidmenuId); + bindClickToMidMenu($midmenuItem1, isoToRightPanel, isoGetMidmenuId); afterAddingMidMenuItem($midmenuItem1, true); if(items.length > 1) { for(var i=1; i