From 6506c9b4db20249f77fcb40be80b32c7b720557d Mon Sep 17 00:00:00 2001
From: Jessica Wang <jessica@cloud.com>
Date: Sun, 24 Oct 2010 00:39:24 -0700
Subject: [PATCH] new UI - template page - fix a bug: match parameters of
 doEditTemplates2() function.

---
 ui/new/scripts/cloud.core2.iso.js      |  8 ++++----
 ui/new/scripts/cloud.core2.resource.js | 14 +++++++-------
 ui/new/scripts/cloud.core2.template.js |  2 +-
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/ui/new/scripts/cloud.core2.iso.js b/ui/new/scripts/cloud.core2.iso.js
index 50d708d080d..68d130f91b4 100644
--- a/ui/new/scripts/cloud.core2.iso.js
+++ b/ui/new/scripts/cloud.core2.iso.js
@@ -267,12 +267,12 @@ function isoClearDetailsTab() {
 
 var isoActionMap = {  
     "Edit ISO": {
-        dialogBeforeActionFn : doEditISO  
+        dialogBeforeActionFn: doEditISO  
     },
     "Delete ISO": {                  
         isAsyncJob: true,
         asyncJobResponse: "deleteisosresponse",
-        dialogBeforeActionFn : doDeleteIso,
+        dialogBeforeActionFn: doDeleteIso,
         inProcessText: "Deleting ISO....",
         afterActionSeccessFn: function(json, $midmenuItem1, id){    
             $midmenuItem1.remove();
@@ -283,7 +283,7 @@ var isoActionMap = {
     "Copy ISO": {
         isAsyncJob: true,
         asyncJobResponse: "copyisoresponse",            
-        dialogBeforeActionFn : doCopyIso,
+        dialogBeforeActionFn: doCopyIso,
         inProcessText: "Copying ISO....",
         afterActionSeccessFn: function(json, $midmenuItem1, id){}   
     }  
@@ -291,7 +291,7 @@ var isoActionMap = {
     "Create VM": {
         isAsyncJob: true,
         asyncJobResponse: "deployvirtualmachineresponse",            
-        dialogBeforeActionFn : doCreateVMFromIso,
+        dialogBeforeActionFn: doCreateVMFromIso,
         inProcessText: "Creating VM....",
         afterActionSeccessFn: function(json, $midmenuItem1, id){}   
     }  
diff --git a/ui/new/scripts/cloud.core2.resource.js b/ui/new/scripts/cloud.core2.resource.js
index ed34c0ae01f..bcdfd80c4fc 100644
--- a/ui/new/scripts/cloud.core2.resource.js
+++ b/ui/new/scripts/cloud.core2.resource.js
@@ -1516,7 +1516,7 @@ var hostActionMap = {
     "Enable Maintenance Mode": {              
         isAsyncJob: true,
         asyncJobResponse: "preparehostformaintenanceresponse",
-        dialogBeforeActionFn : doEnableMaintenanceMode,
+        dialogBeforeActionFn: doEnableMaintenanceMode,
         inProcessText: "Enabling Maintenance Mode....",
         afterActionSeccessFn: function(json, $midmenuItem1, id) {            
             hostToMidmenu(json.queryasyncjobresultresponse.host[0], $midmenuItem1);
@@ -1527,7 +1527,7 @@ var hostActionMap = {
     "Cancel Maintenance Mode": {              
         isAsyncJob: true,
         asyncJobResponse: "cancelhostmaintenanceresponse",
-        dialogBeforeActionFn : doCancelMaintenanceMode,
+        dialogBeforeActionFn: doCancelMaintenanceMode,
         inProcessText: "Cancelling Maintenance Mode....",
         afterActionSeccessFn: function(json, $midmenuItem1, id) {            
             hostToMidmenu(json.queryasyncjobresultresponse.host[0], $midmenuItem1);
@@ -1538,7 +1538,7 @@ var hostActionMap = {
     "Force Reconnect": {              
         isAsyncJob: true,
         asyncJobResponse: "reconnecthostresponse",
-        dialogBeforeActionFn : doForceReconnect,
+        dialogBeforeActionFn: doForceReconnect,
         inProcessText: "Reconnecting....",
         afterActionSeccessFn: function(json, $midmenuItem1, id) {
             hostToMidmenu(json.queryasyncjobresultresponse.host[0], $midmenuItem1);
@@ -1548,7 +1548,7 @@ var hostActionMap = {
     },
     "Remove Host": {              
         isAsyncJob: false,        
-        dialogBeforeActionFn : doRemoveHost,
+        dialogBeforeActionFn: doRemoveHost,
         inProcessText: "Removing Host....",
         afterActionSeccessFn: function(json, $midmenuItem1, id) {    
             $midmenuItem1.remove();
@@ -1558,7 +1558,7 @@ var hostActionMap = {
     },    
     "Update OS Preference": {              
         isAsyncJob: false,        
-        dialogBeforeActionFn : doUpdateOSPreference,
+        dialogBeforeActionFn: doUpdateOSPreference,
         inProcessText: "Updating OS Preference....",
         afterActionSeccessFn: function(json, $midmenuItem1, id) {     
             //call listHosts API before bug 6650 ("updateHost API should return an embedded object like what listHosts API does") is fixed.
@@ -1669,7 +1669,7 @@ function doUpdateOSPreference($actionLink, $detailsTab, $midmenuItem1){
 var primarystorageActionMap = {
     "Delete Primary Storage": {              
         isAsyncJob: false,        
-        dialogBeforeActionFn : doDeletePrimaryStorage,
+        dialogBeforeActionFn: doDeletePrimaryStorage,
         inProcessText: "Deleting Primary Storage....",
         afterActionSeccessFn: function(json, $midmenuItem1, id) {   
             $midmenuItem1.remove();
@@ -1699,7 +1699,7 @@ function doDeletePrimaryStorage($actionLink, $detailsTab, $midmenuItem1){
 var secondarystorageActionMap = {
     "Delete Secondary Storage": {   
         isAsyncJob: false,   
-        dialogBeforeActionFn : doDeleteSecondaryStorage,       
+        dialogBeforeActionFn: doDeleteSecondaryStorage,       
         inProcessText: "Deleting Secondary Storaget....",
         afterActionSeccessFn: function(json, id, $subgridItem) {                        
             $subgridItem.slideUp("slow", function() {
diff --git a/ui/new/scripts/cloud.core2.template.js b/ui/new/scripts/cloud.core2.template.js
index d488211a1b0..f4af03afac1 100644
--- a/ui/new/scripts/cloud.core2.template.js
+++ b/ui/new/scripts/cloud.core2.template.js
@@ -402,7 +402,7 @@ function doEditTemplate($actionLink, $detailsTab, $midmenuItem1) {
         return false;
     });
     $detailsTab.find("#save_button").unbind("click").bind("click", function(event){        
-        doEditTemplate2($detailsTab);     
+        doEditTemplate2($actionLink, $detailsTab, $midmenuItem1);     
         $editFields.hide();      
         $readonlyFields.show();       
         $("#save_button, #cancel_button").hide();