Merge branch 'master' of ssh://git.onelab.eu/git/myslice

[myslice.git] / plugins / querytable / static / js / querytable.js

diff --git a/plugins/querytable/static/js/querytable.js b/plugins/querytable/static/js/querytable.js
index 6a553bc..39e5049 100644 (file)
--- a/plugins/querytable/static/js/querytable.js
+++ b/plugins/querytable/static/js/querytable.js
@@ -39,10 +39,19 @@
             // $(window).unbind('QueryTable');
 
             var query = manifold.query_store.find_analyzed_query(this.options.query_uuid);
-            this.method = query.object;
-
-            var keys = manifold.metadata.get_key(this.method);
-            this.key = (keys && keys.length == 1) ? keys[0] : null;
+            this.object = query.object;
+
+           // xxx beware that this.key needs to contain a key that all records will have
+           // in general query_all will return well populated records, but query
+           // returns records with only the fields displayed on startup. 
+           this.key = (this.options.id_key);
+           if (typeof(this.key)=='undefined' || (this.key).startsWith("unknown")) {
+                   // if not specified by caller, decide from metadata
+                   var keys = manifold.metadata.get_key(this.object);
+                   this.key = (keys && keys.length == 1) ? keys[0] : null;
+           }
+           if (! this.key) messages.warning("querytable.init could not kind valid key");
+           messages.debug("querytable: key="+this.key);
 
             /* Setup query and record handlers */
             this.listen_query(options.query_uuid);
@@ -153,6 +162,7 @@
 
         checkbox_html : function (key, value)
         {
+//         if (debug) messages.debug("checkbox_html, value="+value);
             var result="";
             // Prefix id with plugin_uuid
             result += "<input";
@@ -161,10 +171,14 @@
             result += " name='" + key + "'";
             result += " type='checkbox'";
             result += " autocomplete='off'";
-            result += " value='" + value + "'";
+           if (value === undefined) {
+               messages.warning("querytable.checkbox_html - undefined value");
+           } else {
+               result += " value='" + value + "'";
+           }
             result += "></input>";
             return result;
-        }, // checkbox
+        }, 
 
 
         new_record: function(record)
@@ -245,28 +259,38 @@
             /* Default: checked = true */
             if (checked === undefined) checked = true;
 
-            var key_value;
+            var id;
             /* The function accepts both records and their key */
             switch (manifold.get_type(record)) {
-                case TYPE_VALUE:
-                    key_value = record;
-                    break;
-                case TYPE_RECORD:
-                    /* XXX Test the key before ? */
-                    key_value = record[this.key];
-                    break;
-                default:
-                    throw "Not implemented";
-                    break;
+            case TYPE_VALUE:
+                id = record;
+                break;
+            case TYPE_RECORD:
+                /* XXX Test the key before ? */
+                id = record[this.key];
+                break;
+            default:
+                throw "Not implemented";
+                break;
             }
 
 
-            var checkbox_id = this.flat_id(this.id('checkbox', key_value));
+               if (id === undefined) {
+                       messages.warning("querytable.set_checkbox record has no id to figure which line to tick");
+                       return;
+               }
+            // PB TO CHECK THE RIGHT CHECKBOXES IS HERE... flat_id using \ in the key
+            // need to use escape_id when creating the id of the checkboxes
+            var checkbox_id = this.flat_id(this.id('checkbox', id));
             // function escape_id(myid) is defined in portal/static/js/common.functions.js
             checkbox_id = escape_id(checkbox_id);
-               // using dataTables's $ to search also in nodes that are not currently displayed
-            var element = this.table.$(checkbox_id);
-               if (debug) messages.debug("set_checkbox checked=" + checked + " id=" + checkbox_id + " matches=" + element.length);
+            // As we are using [id="x"] syntax, we need to remove the # in the checkbox_id
+            checkbox_id = checkbox_id.replace("#","");
+            // using dataTables's $ to search also in nodes that are not currently displayed
+            var element = this.table.$('[id="' + checkbox_id + '"]');
+            if (debug) 
+                messages.debug("set_checkbox checked=" + checked
+                               + " id=" + checkbox_id + " matches=" + element.length);
             element.attr('checked', checked);
         },
 
@@ -351,7 +375,6 @@
         {
             if (this.received_all_query) {
                // if the 'all' query has been dealt with already we may turn on the checkbox
-               if (debug) messages.debug("turning on checkbox for record "+record[this.key]);
                 this.set_checkbox(record, true);
             } else {
                // otherwise we need to remember that and do it later on
@@ -537,7 +560,7 @@
             var self = e.data;
 
             // XXX this.value = key of object to be added... what about multiple keys ?
-           if (debug) messages.debug("querytable click handler checked=" + this.checked + " hrn=" + this.value);
+           if (debug) messages.debug("querytable click handler checked=" + this.checked + " "+this.key+"=" + this.value);
             manifold.raise_event(self.options.query_uuid, this.checked?SET_ADD:SET_REMOVED, this.value);
             //return false; // prevent checkbox to be checked, waiting response from manifold plugin api