X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=plugins%2Fhazelnut%2Fstatic%2Fjs%2Fhazelnut.js;h=dbff4ce1081a50c53c15bde5dda65a96c8018eda;hb=a0636b9fc2e25428fb9e66c61c8ce85d1b35cc5b;hp=748a0a5dea1bcc4a7a9a48d95d4900d1e0fcf803;hpb=80f12b8fb93ab7227bffad8c7aa22020fab007e5;p=myslice.git
diff --git a/plugins/hazelnut/static/js/hazelnut.js b/plugins/hazelnut/static/js/hazelnut.js
index 748a0a5d..dbff4ce1 100644
--- a/plugins/hazelnut/static/js/hazelnut.js
+++ b/plugins/hazelnut/static/js/hazelnut.js
@@ -6,9 +6,8 @@
(function($){
- // TEMP
var debug=false;
- debug=true
+// debug=true
var Hazelnut = Plugin.extend({
@@ -17,10 +16,17 @@
this._super(options, element);
/* Member variables */
- // query status
- this.received_all = false;
- this.received_set = false;
- this.in_set_buffer = Array();
+ // in general we expect 2 queries here
+ // query_uuid refers to a single object (typically a slice)
+ // query_all_uuid refers to a list (typically resources or users)
+ // these can return in any order so we keep track of which has been received yet
+ this.received_all_query = false;
+ this.received_query = false;
+
+ // an internal buffer for records that are 'in' and thus need to be checked
+ this.buffered_records_to_check = [];
+ // an internal buffer for keeping lines and display them in one call to fnAddData
+ this.buffered_lines = [];
/* XXX Events XXX */
// this.$element.on('show.Datatables', this.on_show);
@@ -43,10 +49,6 @@
this.initialize_table();
},
- default_options: {
- 'checkboxes': false
- },
-
/* PLUGIN EVENTS */
on_show: function(e)
@@ -77,11 +79,14 @@
{
/* Transforms the table into DataTable, and keep a pointer to it */
var self = this;
- actual_options = {
+ var actual_options = {
// Customize the position of Datatables elements (length,filter,button,...)
// we use a fluid row on top and another on the bottom, making sure we take 12 grid elt's each time
- sDom: "<'row-fluid'<'span5'l><'span1'r><'span6'f>>t<'row-fluid'<'span5'i><'span7'p>>",
- sPaginationType: 'bootstrap',
+ sDom: "<'row'<'col-md-5'l><'col-md-1'r><'col-md-6'f>>t<'row'<'col-md-5'i><'col-md-7'p>>",
+ // XXX as of sept. 2013, I cannot locate a bootstrap3-friendly mode for now
+ // hopefully this would come with dataTables v1.10 ?
+ // in any case, search for 'sPaginationType' all over the code for more comments
+ sPaginationType: 'full_numbers',
// Handle the null values & the error : Datatables warning Requested unknown parameter
// http://datatables.net/forums/discussion/5331/datatables-warning-...-requested-unknown-parameter/p2
aoColumnDefs: [{sDefaultContent: '',aTargets: [ '_all' ]}],
@@ -92,7 +97,16 @@
// XXX use $.proxy here !
};
// the intention here is that options.datatables_options as coming from the python object take precedence
- // XXX DISABLED by jordan: was causing errors in datatables.js $.extend(actual_options, options.datatables_options );
+ // xxx DISABLED by jordan: was causing errors in datatables.js
+ // xxx turned back on by Thierry - this is the code that takes python-provided options into account
+ // check your datatables_options tag instead
+ // however, we have to accumulate in aoColumnDefs from here (above)
+ // and from the python wrapper (checkboxes management, plus any user-provided aoColumnDefs)
+ if ( 'aoColumnDefs' in this.options.datatables_options) {
+ actual_options['aoColumnDefs']=this.options.datatables_options['aoColumnDefs'].concat(actual_options['aoColumnDefs']);
+ delete this.options.datatables_options['aoColumnDefs'];
+ }
+ $.extend(actual_options, this.options.datatables_options );
this.table = this.elmt('table').dataTable(actual_options);
/* Setup the SelectAll button in the dataTable header */
@@ -133,106 +147,13 @@
return (tabIndex.length > 0) ? tabIndex[0] : -1;
}, // getColIndex
- // UNUSED ? // this.update_plugin = function(e, rows) {
- // UNUSED ? // // e.data is what we passed in second argument to subscribe
- // UNUSED ? // // so here it is the jquery object attached to the plugin
- // UNUSED ? // var $plugindiv=e.data;
- // UNUSED ? // if (debug)
- // UNUSED ? // messages.debug("entering hazelnut.update_plugin on id '" + $plugindiv.attr('id') + "'");
- // UNUSED ? // // clear the spinning wheel: look up an ancestor that has the need-spin class
- // UNUSED ? // // do this before we might return
- // UNUSED ? // $plugindiv.closest('.need-spin').spin(false);
- // UNUSED ? //
- // UNUSED ? // var options = this.options;
- // UNUSED ? // var hazelnut = this;
- // UNUSED ? //
- // UNUSED ? // /* if we get no result, or an error, try to make that clear, and exit */
- // UNUSED ? // if (rows.length==0) {
- // UNUSED ? // if (debug)
- // UNUSED ? // messages.debug("Empty result on hazelnut " + this.options.domid);
- // UNUSED ? // var placeholder=$(this.table).find("td.dataTables_empty");
- // UNUSED ? // console.log("placeholder "+placeholder);
- // UNUSED ? // if (placeholder.length==1)
- // UNUSED ? // placeholder.html(unfold.warning("Empty result"));
- // UNUSED ? // else
- // UNUSED ? // this.table.html(unfold.warning("Empty result"));
- // UNUSED ? // return;
- // UNUSED ? // } else if (typeof(rows[0].error) != 'undefined') {
- // UNUSED ? // // we now should have another means to report errors that this inline/embedded hack
- // UNUSED ? // if (debug)
- // UNUSED ? // messages.error ("undefined result on " + this.options.domid + " - should not happen anymore");
- // UNUSED ? // this.table.html(unfold.error(rows[0].error));
- // UNUSED ? // return;
- // UNUSED ? // }
- // UNUSED ? //
- // UNUSED ? // /*
- // UNUSED ? // * fill the dataTables object
- // UNUSED ? // * we cannot set html content directly here, need to use fnAddData
- // UNUSED ? // */
- // UNUSED ? // var lines = new Array();
- // UNUSED ? //
- // UNUSED ? // this.current_resources = Array();
- // UNUSED ? //
- // UNUSED ? // $.each(rows, function(index, row) {
- // UNUSED ? // // this models a line in dataTables, each element in the line describes a cell
- // UNUSED ? // line = new Array();
- // UNUSED ? //
- // UNUSED ? // // go through table headers to get column names we want
- // UNUSED ? // // in order (we have temporarily hack some adjustments in names)
- // UNUSED ? // var cols = object.table.fnSettings().aoColumns;
- // UNUSED ? // var colnames = cols.map(function(x) {return x.sTitle})
- // UNUSED ? // var nb_col = cols.length;
- // UNUSED ? // /* if we've requested checkboxes, then forget about the checkbox column for now */
- // UNUSED ? // if (options.checkboxes) nb_col -= 1;
- // UNUSED ? //
- // UNUSED ? // /* fill in stuff depending on the column name */
- // UNUSED ? // for (var j = 0; j < nb_col; j++) {
- // UNUSED ? // if (typeof colnames[j] == 'undefined') {
- // UNUSED ? // line.push('...');
- // UNUSED ? // } else if (colnames[j] == 'hostname') {
- // UNUSED ? // if (row['type'] == 'resource,link')
- // UNUSED ? // //TODO: we need to add source/destination for links
- // UNUSED ? // line.push('');
- // UNUSED ? // else
- // UNUSED ? // line.push(row['hostname']);
- // UNUSED ? // } else {
- // UNUSED ? // if (row[colnames[j]])
- // UNUSED ? // line.push(row[colnames[j]]);
- // UNUSED ? // else
- // UNUSED ? // line.push('');
- // UNUSED ? // }
- // UNUSED ? // }
- // UNUSED ? //
- // UNUSED ? // /* catch up with the last column if checkboxes were requested */
- // UNUSED ? // if (options.checkboxes) {
- // UNUSED ? // var checked = '';
- // UNUSED ? // // xxx problem is, we don't get this 'sliver' thing set apparently
- // UNUSED ? // if (typeof(row['sliver']) != 'undefined') { /* It is equal to null when is present */
- // UNUSED ? // checked = 'checked ';
- // UNUSED ? // hazelnut.current_resources.push(row[ELEMENT_KEY]);
- // UNUSED ? // }
- // UNUSED ? // // Use a key instead of hostname (hard coded...)
- // UNUSED ? // line.push(hazelnut.checkbox(options.plugin_uuid, row[ELEMENT_KEY], row['type'], checked, false));
- // UNUSED ? // }
- // UNUSED ? //
- // UNUSED ? // lines.push(line);
- // UNUSED ? //
- // UNUSED ? // });
- // UNUSED ? //
- // UNUSED ? // this.table.fnClearTable();
- // UNUSED ? // if (debug)
- // UNUSED ? // messages.debug("hazelnut.update_plugin: total of " + lines.length + " rows");
- // UNUSED ? // this.table.fnAddData(lines);
- // UNUSED ? //
- // UNUSED ? // }, // update_plugin
-
- checkbox: function (key, value)
+ checkbox_html : function (key, value)
{
var result="";
// Prefix id with plugin_uuid
result += "