feature #1664: Fix chg cluster bug

Add chg cluster to datastore
This commit is contained in:
Tino Vazquez committed 2013-02-28 18:22:06 +01:00
1 parent c40fdb1dcb
commit bfae273a3d
3 files changed
+19 -16

No files matched your search

@@ -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){
<td class="value_td">'+info.NAME+'</td>\
<td></td>\
</tr>\
<tr>\
<td class="key_td">'+tr("Cluster")+'</td>\
<td class="value_td">'+(info.CLUSTER.length ? info.CLUSTER : "-")+'</td>\
</tr>\
<tr>'+
insert_cluster_dropdown("Datastore",info.ID,info.CLUSTER,info.CLUSTER_ID) +
'</tr>\
<tr>\
<td class="key_td">'+tr("Base path")+'</td>\
<td class="value_td">'+info.BASE_PATH+'</td>\
+5 -2
View File
@@ -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);
}
});
+1 -1
View File
@@ -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){