X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=plugins%2Fhazelnut%2Fhazelnut.js;h=dbe29b5399cab4580bcb9dde751d02b36259e8f7;hb=401546ae932e7f2d120ec210c13e2db1ce754cc7;hp=bbaf11ec764749c577770232366568569f5ae202;hpb=a627b9a4b0193193e8a05ae030a25c913d742ea0;p=unfold.git diff --git a/plugins/hazelnut/hazelnut.js b/plugins/hazelnut/hazelnut.js index bbaf11ec..dbe29b53 100644 --- a/plugins/hazelnut/hazelnut.js +++ b/plugins/hazelnut/hazelnut.js @@ -127,7 +127,7 @@ fnDrawCallback: function() { hazelnut_draw_callback.call(object, options); } }; // the intention here is that options.datatables_options as coming from the python object take precedence - $.extend(actual_options, options.datatables_options ); +// XXX DISABLED by jordan: was causing errors in datatables.js $.extend(actual_options, options.datatables_options ); this.table = $('#hazelnut-' + options.plugin_uuid).dataTable(actual_options); /* Setup the SelectAll button in the dataTable header */ @@ -372,6 +372,7 @@ */ function hazelnut_filter (oSettings, aData, iDataIndex) { var cur_query = this.current_query; + if (!cur_query) return true; var ret = true; /* We have an array of filters : a filter is an array (key op val)