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

bug #2437: Apply order parameter to all the data tables

Browse Source
This commit is contained in:
Daniel Molina 2013-11-20 16:28:29 +01:00
parent 5ee666c765
commit 998c3fb8c7
6 changed files with 51 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -206,6 +206,8 @@ function setupCreateClusterDialog(){
dataTable_cluster_hosts.fnFilter( $(this).val() );
})
dataTable_cluster_vnets = $("#datatable_cluster_vnets", dialog).dataTable({
"sDom" : '<"H">t<"F"p>',
"oColVis": {
@ -246,12 +248,13 @@ function setupCreateClusterDialog(){
dataTable_cluster_datastores.fnFilter( $(this).val() );
})
// ------- End of create the dialog datatables ------------
// Add listener to row select action
// Marks it in another background color
// Adds or removes the element from the list
$('#datatable_cluster_hosts', dialog).delegate("tr", "click", function(e){
$('#datatable_cluster_hosts tbody', dialog).delegate("tr", "click", function(e){
if ($(e.target).is('input') ||
$(e.target).is('select') ||
$(e.target).is('option')) return true;
@ -288,7 +291,7 @@ function setupCreateClusterDialog(){
});
$('#datatable_cluster_vnets', dialog).delegate("tr", "click", function(e){
$('#datatable_cluster_vnets tbody', dialog).delegate("tr", "click", function(e){
if ($(e.target).is('input') ||
$(e.target).is('select') ||
$(e.target).is('option')) return true;
@ -325,7 +328,7 @@ function setupCreateClusterDialog(){
});
$('#datatable_cluster_datastores', dialog).delegate("tr", "click", function(e){
$('#datatable_cluster_datastores tbody', dialog).delegate("tr", "click", function(e){
if ($(e.target).is('input') ||
$(e.target).is('select') ||
$(e.target).is('option')) return true;
@ -483,6 +486,7 @@ function popUpCreateClusterDialog(){
Sunstone.runAction("ClusterHost.list");
Sunstone.runAction("ClusterVN.list");
Sunstone.runAction("ClusterDS.list");
$create_cluster_dialog.reveal();
$("input#name",$create_cluster_dialog).focus();
@ -718,6 +722,7 @@ var cluster_host_actions = {
callback: function(request,host_list){
updateClusterHostsView(request,host_list);
dataTable_cluster_hosts.fnFilter( filter_expr, 3, true);
dataTable_cluster_hosts.fnSort( [ [1,config['user_config']['table_order']] ] );
},
error: onError
},
@ -725,7 +730,10 @@ var cluster_host_actions = {
"ClusterHostInfo.list" : {
type: "list",
call: OpenNebula.Host.list,
callback: updateClusterHostsInfoView,
callback: function(request,host_list){
updateClusterHostsInfoView(request,host_list);
dataTable_cluster_hosts_panel.fnSort( [ [1,config['user_config']['table_order']] ] );
},
error: onError
}
}
@ -766,6 +774,7 @@ var cluster_vnet_actions = {
callback: function(request,vnet_list){
updateClusterVNetworksView(request,vnet_list);
dataTable_cluster_vnets.fnFilter( filter_expr, 5, true);
dataTable_cluster_vnets.fnSort( [ [1,config['user_config']['table_order']] ] );
},
error: onError
},
@ -773,7 +782,10 @@ var cluster_vnet_actions = {
"ClusterVNInfo.list" : {
type: "list",
call: OpenNebula.Network.list,
callback: updateClusterVNetworksInfoView,
callback: function(request,vnet_list){
updateClusterVNetworksInfoView(request,vnet_list);
dataTable_cluster_vnets_panel.fnSort( [ [1,config['user_config']['table_order']] ] );
},
error: onError
}
}
@ -813,6 +825,7 @@ var cluster_datastore_actions = {
callback: function(request,ds_list){
updateClusterDatastoresView(request,ds_list);
dataTable_cluster_datastores.fnFilter( filter_expr, 6, true);
dataTable_cluster_datastores.fnSort( [ [1,config['user_config']['table_order']] ] );
if(filter_expr!="-")
Sunstone.runAction("Cluster.show_to_update", cluster_id);
},
@ -822,7 +835,10 @@ var cluster_datastore_actions = {
"ClusterDSInfo.list" : {
type: "list",
call: OpenNebula.Datastore.list,
callback: updateClusterDatastoresInfoView,
callback: function(request,ds_list){
updateClusterDatastoresInfoView(request,ds_list);
dataTable_cluster_datastores_panel.fnSort( [ [1,config['user_config']['table_order']] ] );
},
error: onError
}
}

3
src/sunstone/public/js/plugins/oneflow-services.js
View File

@ -1025,7 +1025,7 @@ var service_actions = {
type: "custom",
call: function() {
Service.list({
timeout: true,
timeout: true,
success: function(request, service_list) {
$("#oneflow-services #error_message").hide();
updateServicesView(request, service_list);
@ -1871,5 +1871,6 @@ $(document).ready(function(){
initCheckAllBoxes(dataTable_services);
tableCheckboxesListener(dataTable_services);
infoListener(dataTable_services,'Service.showinfo');
dataTable_services.fnSort( [ [1,config['user_config']['table_order']] ] );
}
});

4
src/sunstone/public/js/plugins/oneflow-templates.js
View File

@ -511,7 +511,7 @@ var service_template_actions = {
type: "custom",
call: function() {
ServiceTemplate.list({
timeout: true,
timeout: true,
success: function(request, service_list) {
$("#oneflow-templates #error_message").hide();
updateServiceTemplatesView(request, service_list);
@ -1533,5 +1533,7 @@ $(document).ready(function(){
infoListener(dataTable_service_templates,'ServiceTemplate.showinfo');
$('div#service_templates_tab div.legend_div').hide();
dataTable_service_templates.fnSort( [ [1,config['user_config']['table_order']] ] );
}
});

17
src/sunstone/public/js/plugins/templates-tab.js
View File

@ -1642,6 +1642,8 @@ function setup_disk_tab_content(disk_section, str_disk_tab_id, str_datatable_id)
dataTable_template_images.fnFilter( $(this).val() );
})
dataTable_template_images.fnSort( [ [1,config['user_config']['table_order']] ] );
$('#'+str_datatable_id + ' tbody', disk_section).delegate("tr", "click", function(e){
dataTable_template_images.unbind("draw");
var aData = dataTable_template_images.fnGetData(this);
@ -1925,6 +1927,8 @@ function setup_nic_tab_content(nic_section, str_nic_tab_id, str_datatable_id) {
dataTable_template_networks.fnFilter( $(this).val() );
})
dataTable_template_networks.fnSort( [ [1,config['user_config']['table_order']] ] );
$('#'+str_datatable_id + ' tbody', nic_section).delegate("tr", "click", function(e){
dataTable_template_networks.unbind("draw");
var aData = dataTable_template_networks.fnGetData(this);
@ -2856,6 +2860,8 @@ function setupCreateTemplateDialog(){
dataTable_template_kernel.fnFilter( $(this).val() );
})
dataTable_template_kernel.fnSort( [ [1,config['user_config']['table_order']] ] );
$('#datatable_kernel tbody', dialog).delegate("tr", "click", function(e){
var aData = dataTable_template_kernel.fnGetData(this);
@ -2908,6 +2914,8 @@ function setupCreateTemplateDialog(){
datTable_template_initrd.fnFilter( $(this).val() );
})
datTable_template_initrd.fnSort( [ [1,config['user_config']['table_order']] ] );
$('#datatable_initrd tbody', dialog).delegate("tr", "click", function(e){
var aData = datTable_template_initrd.fnGetData(this);
@ -3342,6 +3350,7 @@ function setupCreateTemplateDialog(){
datTable_template_context.fnFilter( $(this).val() );
})
datTable_template_context.fnSort( [ [1,config['user_config']['table_order']] ] );
var selected_files = {};
var file_row_hash = {};
@ -3619,6 +3628,8 @@ function setupCreateTemplateDialog(){
dataTable_template_hosts.fnFilter( $(this).val() );
})
dataTable_template_hosts.fnSort( [ [1,config['user_config']['table_order']] ] );
var selected_hosts = {};
var host_row_hash = {};
@ -3697,6 +3708,8 @@ function setupCreateTemplateDialog(){
dataTable_template_clusters.fnFilter( $(this).val() );
})
dataTable_template_clusters.fnSort( [ [1,config['user_config']['table_order']] ] );
var selected_clusters = {};
var cluster_row_hash = {};
@ -5076,6 +5089,8 @@ function setupInstantiateTemplateDialog(easy_provision){
dataTable_template_images.fnFilter( $(this).val() );
})
dataTable_template_images.fnSort( [ [1,config['user_config']['table_order']] ] );
$('#template_images_table tbody', dialog).delegate("tr", "click", function(e){
var aData = dataTable_template_images.fnGetData(this);
@ -5125,6 +5140,8 @@ function setupInstantiateTemplateDialog(easy_provision){
dataTable_template_templates.fnFilter( $(this).val() );
})
dataTable_template_templates.fnSort( [ [1,config['user_config']['table_order']] ] );
$('#template_templates_table tbody', dialog).delegate("tr", "click", function(e){
var aData = dataTable_template_templates.fnGetData(this);

6
src/sunstone/public/js/plugins/vms-tab.js
View File

@ -3013,7 +3013,7 @@ function setup_vm_snapshot_tab(){
// which is a lot.
function setupCreateVMDialog(include_select_image){
dialogs_context.append('<div title=\"'+tr("Create Virtual Machine")+'\" id="create_vm_dialog"></div>');
dialogs_context.append('<div id="create_vm_dialog"></div>');
//Insert HTML in place
$create_vm_dialog = $('#create_vm_dialog')
var dialog = $create_vm_dialog;
@ -3046,6 +3046,8 @@ function setupCreateVMDialog(include_select_image){
dataTable_template_templates.fnFilter( $(this).val() );
})
dataTable_template_templates.fnSort( [ [1,config['user_config']['table_order']] ] );
$('#template_templates_table tbody', dialog).delegate("tr", "click", function(e){
var aData = dataTable_template_templates.fnGetData(this);
@ -3097,6 +3099,8 @@ function setupCreateVMDialog(include_select_image){
dataTable_template_images.fnFilter( $(this).val() );
})
dataTable_template_images.fnSort( [ [1,config['user_config']['table_order']] ] );
$('#template_images_table tbody', dialog).delegate("tr", "click", function(e){
var aData = dataTable_template_images.fnGetData(this);

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

@ -1601,5 +1601,7 @@ $(document).ready(function(){
});
$('div#vnets_tab div.legend_div').hide();
dataTable_vNetworks.fnSort( [ [1,config['user_config']['table_order']] ] );
}
});