shaba/one
1
0
Fork 0
mirror of https://github.com/OpenNebula/one.git synced 2025-03-21 14:50:08 +03:00
Code Releases Wiki Activity

bug #2182: Fix filters on datastores(cherry picked from commit e5b60f378c98e07857d89a8a22e62ade0773153c)

Browse Source
This commit is contained in:
Daniel Molina 2013-07-19 18:15:51 +02:00
parent ec18e9699b
commit 81ae08b469
3 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/sunstone/public/js/plugins/clusters-tab.js
View File

@ -61,11 +61,12 @@ var datastore_datatable_table_tmpl='<thead>\
<th>'+tr("Owner")+'</th>\
<th>'+tr("Group")+'</th>\
<th>'+tr("Name")+'</th>\
<th>'+tr("Capacity")+'</th>\
<th>'+tr("Cluster")+'</th>\
<th>'+tr("Basepath")+'</th>\
<th>'+tr("TM MAD")+'</th>\
<th>'+tr("DS MAD")+'</th>\
<th>'+tr("System")+'</th>\
<th>'+tr("Type")+'</th>\
</tr>\
</thead>\
<tbody id="tbodydatastores">\
@ -232,7 +233,7 @@ function setupCreateClusterDialog(){
},
"aoColumnDefs": [
{ "sWidth": "35px", "aTargets": [1] },
{ "bVisible": false, "aTargets": [0,6,7,8,9] } // 5 = cluster
{ "bVisible": false, "aTargets": [0,6,7,8,9,10] } // 5 = cluster
],
"oLanguage": (datatable_lang != "") ?
{
@ -809,7 +810,7 @@ var cluster_datastore_actions = {
call: OpenNebula.Datastore.list,
callback: function(request,ds_list){
updateClusterDatastoresView(request,ds_list);
dataTable_cluster_datastores.fnFilter( filter_expr, 5, true);
dataTable_cluster_datastores.fnFilter( filter_expr, 6, true);
if(filter_expr!="-")
Sunstone.runAction("Cluster.show_to_update", cluster_id);
},
@ -1348,7 +1349,7 @@ function updateClusterInfo(request,cluster){
},
"aoColumnDefs": [
{ "sWidth": "35px", "aTargets": [1] },
{ "bVisible": false, "aTargets": [0,5,6,7,8,9] }
{ "bVisible": false, "aTargets": [0,6,7,8,9,10] }
],
"oLanguage": (datatable_lang != "") ?
{
@ -1375,7 +1376,7 @@ function clusterResourceViewListeners(){
dataTable_hosts.fnFilter(getClusterName(filter_id),3,false,true,false,true);
break;
case 'datastores_tab':
dataTable_datastores.fnFilter(getClusterName(filter_id),5,false,true,false,true);
dataTable_datastores.fnFilter(getClusterName(filter_id),6,false,true,false,true);
break;
case 'vnets_tab':
dataTable_vNetworks.fnFilter(getClusterName(filter_id),5,false,true,false,true);

2
src/sunstone/public/js/plugins/files-tab.js
View File

@ -938,7 +938,7 @@ function popUpCreateFileDialog(){
datastores_str = makeSelectOptions(dataTable_datastores,
1,
4,
[9,9],//system ds
[10,10],//system ds
['image','system'], //filter image & sys datastores
true
);

2
src/sunstone/public/js/plugins/images-tab.js
View File

@ -1221,7 +1221,7 @@ function popUpCreateImageDialog(){
datastores_str = makeSelectOptions(dataTable_datastores,
1,
4,
[9,9],//system ds
[10,10],//system ds
['file','system'], //filter image & sys datastores
true
);