diff --git a/ui/new/scripts/cloud.core2.instance.js b/ui/new/scripts/cloud.core2.instance.js index c96297439eb..4c45010cef9 100644 --- a/ui/new/scripts/cloud.core2.instance.js +++ b/ui/new/scripts/cloud.core2.instance.js @@ -430,6 +430,7 @@ function clickInstanceGroupHeader($arrowIcon) { api: "detachVolume", isAsyncJob: true, asyncJobResponse: "detachvolumeresponse", + inProcessText: "Detaching disk....", afterActionSeccessFn: function(jsonObj, template){ template.slideUp("slow", function(){ $(this).remove(); @@ -440,6 +441,7 @@ function clickInstanceGroupHeader($arrowIcon) { isAsyncJob: true, asyncJobResponse: "createtemplateresponse", dialogBeforeActionFn : doCreateTemplate, + inProcessText: "Creating template....", afterActionSeccessFn: function(){} } } diff --git a/ui/new/scripts/cloud.core2.js b/ui/new/scripts/cloud.core2.js index fbef2d78a43..59ae5a23844 100644 --- a/ui/new/scripts/cloud.core2.js +++ b/ui/new/scripts/cloud.core2.js @@ -181,8 +181,6 @@ function handleErrorInMidMenu(XMLHttpResponse, $midmenuItem) { //***** actions for middle menu (end) ************************************************************************** //***** actions for right panel (begin) ************************************************************************ -//var selectedItemsInSingleObject = {}; - function buildActionLinkForSingleObject(label, actionMap, $actionMenu, listAPIMap, $singleObject) { //debugger; var apiInfo = actionMap[label]; @@ -190,11 +188,12 @@ function buildActionLinkForSingleObject(label, actionMap, $actionMenu, listAPIMa $actionMenu.find("#action_list").append($listItem.show()); var $link = $listItem.find("#link").text(label); $link.data("label", label); + $link.data("inProcessText", apiInfo.inProcessText); $link.data("api", apiInfo.api); $link.data("isAsyncJob", apiInfo.isAsyncJob); $link.data("asyncJobResponse", apiInfo.asyncJobResponse); $link.data("afterActionSeccessFn", apiInfo.afterActionSeccessFn); - $link.data("dialogBeforeActionFn", apiInfo.dialogBeforeActionFn); + $link.data("dialogBeforeActionFn", apiInfo.dialogBeforeActionFn); var id = $singleObject.data("id"); @@ -203,32 +202,30 @@ function buildActionLinkForSingleObject(label, actionMap, $actionMenu, listAPIMa $actionMenu.hide(); var $actionLink = $(this); var dialogBeforeActionFn = $actionLink.data("dialogBeforeActionFn"); - if(dialogBeforeActionFn == null) { - //for(var id in selectedItemsInSingleObject) { - var apiCommand = "command="+$actionLink.data("api")+"&id="+id; - doActionToSingleObject(id, $actionLink, apiCommand, listAPIMap, $singleObject); - //} + if(dialogBeforeActionFn == null) { + var apiCommand = "command="+$actionLink.data("api")+"&id="+id; + doActionToSingleObject(id, $actionLink, apiCommand, listAPIMap, $singleObject); } else { dialogBeforeActionFn($actionLink, listAPIMap, $singleObject); - } - //selectedItemsInSingleObject = {}; //clear selected items for action + } return false; }); } function doActionToSingleObject(id, $actionLink, apiCommand, listAPIMap, $singleObject) { //debugger; - var label = $actionLink.data("label"); + var label = $actionLink.data("label"); + var inProcessText = $actionLink.data("inProcessText"); var isAsyncJob = $actionLink.data("isAsyncJob"); var asyncJobResponse = $actionLink.data("asyncJobResponse"); var afterActionSeccessFn = $actionLink.data("afterActionSeccessFn"); var listAPI = listAPIMap["listAPI"]; var listAPIResponse = listAPIMap["listAPIResponse"]; var listAPIResponseObj = listAPIMap["listAPIResponseObj"]; - + var $spinningWheel = $singleObject.find("#spinning_wheel"); - $spinningWheel.find("#description").text(label + "...."); + $spinningWheel.find("#description").text(inProcessText); $spinningWheel.show(); //Async job (begin) ***** diff --git a/ui/new/scripts/cloud.core2.volume.js b/ui/new/scripts/cloud.core2.volume.js index 9ec5aca8d27..9c9143ba3d0 100644 --- a/ui/new/scripts/cloud.core2.volume.js +++ b/ui/new/scripts/cloud.core2.volume.js @@ -46,12 +46,14 @@ var volumeActionMap = { api: "detachVolume", isAsyncJob: true, asyncJobResponse: "detachvolumeresponse", + inProcessText: "Detaching disk....", afterActionSeccessFn: function(){} }, "Create Template": { isAsyncJob: true, asyncJobResponse: "createtemplateresponse", dialogBeforeActionFn : doCreateTemplate, + inProcessText: "Creating template....", afterActionSeccessFn: function(){} } }