diff --git a/src/sunstone/public/js/plugins/datastores-tab.js b/src/sunstone/public/js/plugins/datastores-tab.js index ee8186a996..2af9dbd5f5 100644 --- a/src/sunstone/public/js/plugins/datastores-tab.js +++ b/src/sunstone/public/js/plugins/datastores-tab.js @@ -453,21 +453,28 @@ var datastore_actions = { "Datastore.addtocluster" : { type: "multiple", - call: function(params){ + call: function(params, success){ var cluster = params.data.extra_param; var ds = params.data.id; if (cluster == -1){ //get cluster name - var current_cluster = getValue(ds,1,5,dataTable_datastores); + var current_cluster = getValue(ds, + 1, + 5, + dataTable_datastores); //get cluster id current_cluster = getValue(current_cluster, - 2,1,dataTable_clusters); + 2, + 1, + dataTable_clusters); if (!current_cluster) return; Sunstone.runAction("Cluster.deldatastore",current_cluster,ds) } else + { Sunstone.runAction("Cluster.adddatastore",cluster,ds); + } }, elements: datastoreElements, notify:true @@ -524,12 +531,6 @@ var datastore_buttons = { layout: "del", condition: mustBeAdmin }, - - //"Datastore.help" : { - // type: "action", - // text: '?', - // alwaysActive: true - //} } var datastore_info_panel = { @@ -648,10 +649,9 @@ function updateDatastoreInfo(request,ds){ '+info.NAME+'\ \ \ - \ - '+tr("Cluster")+'\ - '+(info.CLUSTER.length ? info.CLUSTER : "-")+'\ - \ + '+ + insert_cluster_dropdown("Datastore",info.ID,info.CLUSTER,info.CLUSTER_ID) + + '\ \ '+tr("Base path")+'\ '+info.BASE_PATH+'\ diff --git a/src/sunstone/public/js/sunstone-util.js b/src/sunstone/public/js/sunstone-util.js index 9b92cfbf3c..6e4e46b506 100644 --- a/src/sunstone/public/js/sunstone-util.js +++ b/src/sunstone/public/js/sunstone-util.js @@ -190,7 +190,7 @@ function updateSingleElement(element,dataTable,tag){ var nodes = dataTable.fnGetNodes(); var tr = $(tag,nodes).parents('tr')[0]; var position = dataTable.fnGetPosition(tr); - dataTable.fnUpdate(element,position,0,false); + dataTable.fnUpdate(element,position,undefined,false); recountCheckboxes(dataTable); } @@ -1926,7 +1926,10 @@ function insert_cluster_dropdown(resource_type, resource_id, cluster_value, clus if(value_str!="") { // Let OpenNebula know - Sunstone.runAction(resource_type+".addtocluster",resource_id,value_str); + var resource_struct = new Array(); + resource_struct[0] = resource_id; + Sunstone.runAction(resource_type+".addtocluster",resource_struct,value_str); + Sunstone.runAction(resource_type+".showinfo",resource_id); } }); diff --git a/src/sunstone/public/js/sunstone.js b/src/sunstone/public/js/sunstone.js index fe9398e869..728f060d5c 100644 --- a/src/sunstone/public/js/sunstone.js +++ b/src/sunstone/public/js/sunstone.js @@ -241,7 +241,7 @@ var Sunstone = { error:err, data: {id:data_arg, monitor: extra_param}}); break; - case "multiple": + case "multiple": //run on the list of nodes that come on the data $.each(data_arg,function(){ if (extra_param){