this release uses bootstrap style for datatables instead of jquery-ui

[myslice.git] / plugins / quickfilter / quickfilter.js

diff --git a/plugins/quickfilter/quickfilter.js b/plugins/quickfilter/quickfilter.js
index 5be5426..589177b 100644 (file)
--- a/plugins/quickfilter/quickfilter.js
+++ b/plugins/quickfilter/quickfilter.js
@@ -6,7 +6,7 @@
  * Copyright (c) 2012 UPMC Sorbonne Universite - INRIA
  * License: GPLv3
  */
-
+// global metadata from js/metadata.js
 ( function($){
 
     var debug=false;
@@ -59,7 +59,7 @@
                        var availableTags={};
                        $.each (rows, function(index, obj) {
                            $.each(obj,function(key,value){                       
-                               value = get_value(value);
+                               value = unfold.get_value(value);
                                if(!availableTags.hasOwnProperty(key)){availableTags[key]=new Array();}
                                //availableTags[key].push(value);
                                var currentArray=availableTags[key];
@@ -87,7 +87,7 @@
                                         query=d.current_query;
                                         query.update_filter(key,op,val);
                                         // Publish the query changed, the other plugins with subscribe will get the changes
-                                        $.publish('/query/' + query.uuid + '/changed', query);
+                                        $.publish('/query/' + query.query_uuid + '/changed', query);
                                         //add_ActiveFilter("#QuickFilter-string-"+key,ui.item.value,d);
                                     }
                                });
@@ -141,7 +141,7 @@
                 var removed_filters = tmp.removed;
                 $.each(removed_filters, function(i,filter){
                     console.log(filter[0]);
-                    allowedValues=getMetadata_property('resource', filter[0], 'allowed_values');
+                    allowedValues=metadata.property('resource', filter[0], 'allowed_values');
                     if (allowedValues!='' && allowedValues!="N/A") {
                        //if(MANIFOLD_METADATA[filter[0]]['allowed_values']!=''){
                         $('#QuickFilter_select_field').val("#");
@@ -192,7 +192,7 @@
                     });            
                 }
             }else{
-                headers=getMetadata_fields('resource');
+                headers=metadata.fields('resource');
                 $.each (headers, function (key, value) {
                     $('#QuickFilter_select_field').append("<option>"+value['column']+"</option>");
                 });
@@ -209,10 +209,10 @@
             }else{
                 $('#QuickFilter_select_value_container').show();
                 $.publish('debug','field selected = '+field);
-                valType=getMetadata_property('resource', field, 'value_type');
+                valType=metadata.property('resource', field, 'value_type');
                 if (valType == 'string' || valType=="N/A") {
                     // If this key has predefined values, build a select with each allowed values as options
-                    allowedValues=getMetadata_property('resource', field, 'allowed_values');
+                    allowedValues=metadata.property('resource', field, 'allowed_values');
                     if (allowedValues!='' && allowedValues!="N/A") {
                         $('#QuickFilter_string_value_div').hide();
                         $('#QuickFilter_int_value_div').hide();
@@ -248,7 +248,7 @@
             var filter_field = $('#QuickFilter_select_field').val();
 
             query.update_filter(filter_field, '=', filter_value);
-            $.publish('/query/' + query.uuid + '/changed', query);
+            $.publish('/query/' + query.query_uuid + '/changed', query);
         });
         
         $('.QuickFilter_select').change( function() {
@@ -271,7 +271,7 @@
                     query.update_filter(key[1], '=', f_value);
                 }
             }
-            $.publish('/query/' + query.uuid + '/changed', query);
+            $.publish('/query/' + query.query_uuid + '/changed', query);
         });
 
     }