Login page: 'register' redirection works and 'the project' redirects to onelab.eu

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

diff --git a/plugins/quickfilter/quickfilter.js b/plugins/quickfilter/quickfilter.js
index f32c0c9..455a2c3 100644 (file)
--- a/plugins/quickfilter/quickfilter.js
+++ b/plugins/quickfilter/quickfilter.js
@@ -1,12 +1,9 @@
 /**
- * MySlice QuickFilter plugin
- * URL: http://trac.myslice.info
  * Description: editing search filters
- * Author: The MySlice Team
  * Copyright (c) 2012 UPMC Sorbonne Universite - INRIA
  * License: GPLv3
  */
-
+// global metadata from js/metadata.js
 ( function($){
 
     var debug=false;
@@ -59,7 +56,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];
@@ -140,8 +137,8 @@
                 // Remove first to clean up select boxes
                 var removed_filters = tmp.removed;
                 $.each(removed_filters, function(i,filter){
-                    console.log(filter[0]);
-                    allowedValues=getMetadata_property('resource', filter[0], 'allowed_values');
+                    messages.debug(filter[0]);
+                    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 +189,7 @@
                     });            
                 }
             }else{
-                headers=getMetadata_fields('resource');
+                headers=metadata.fields('resource');
                 $.each (headers, function (key, value) {
                     $('#QuickFilter_select_field').append("<option>"+value['column']+"</option>");
                 });
@@ -201,7 +198,7 @@
 
         $('#QuickFilter_select_field').change( function () {
             var field = $(this).val();
-            console.log(field);
+            messages.debug(field);
             $('input[id^="QuickFilter-string-"]').hide();
             $('#QuickFilter_int_value_div').hide();
             if(field=="#"){
@@ -209,10 +206,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();
@@ -252,7 +249,7 @@
         });
         
         $('.QuickFilter_select').change( function() {
-            console.log(this.id);
+            messages.debug(this.id);
             var query = data.current_query;
            var f_value = $(this).val();
             
@@ -264,7 +261,7 @@
                          f_value = "";
            */
             if(typeof(key[1])!="undefined"){
-                console.log(key[1]+'='+f_value);
+                messages.debug(key[1]+'='+f_value);
                 if(f_value==""){
                     query.remove_filter(key[1],"","");
                 }else{