X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=plugins%2Fquerytable%2Fstatic%2Fjs%2Fquerytable.js;h=9d7bced0716ff2d6f51ceedb3a0ff05c5e1c9fab;hb=265fd105b18cfa17791352c04a8da976b2c4826f;hp=30c727b76a0ffd35f2beb30e231808c8137f1e7d;hpb=c025814eadebf386f556f9af571d3f04e2124a80;p=myslice.git

diff --git a/plugins/querytable/static/js/querytable.js b/plugins/querytable/static/js/querytable.js
index 30c727b7..9d7bced0 100644
--- a/plugins/querytable/static/js/querytable.js
+++ b/plugins/querytable/static/js/querytable.js
@@ -41,8 +41,18 @@
             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;
+	    // 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 (! this.key) {
+		// if not specified by caller, decide from metadata
+		var keys = manifold.metadata.get_key(this.method);
+		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 +163,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 +172,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 +260,34 @@
             /* 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;
+	    }
+            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
+            // 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);
+            if (debug) 
+                messages.debug("set_checkbox checked=" + checked
+                               + " id=" + checkbox_id + " matches=" + element.length);
             element.attr('checked', checked);
         },
 
@@ -350,14 +371,13 @@
         on_new_record: function(record)
         {
             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]);
+        	// if the 'all' query has been dealt with already we may turn on the checkbox
                 this.set_checkbox(record, true);
-        	} else {
-        		// otherwise we need to remember that and do it later on
-        		if (debug) messages.debug("Remembering record to check " + record[this.key]);
+            } else {
+        	// otherwise we need to remember that and do it later on
+        	if (debug) messages.debug("Remembering record to check " + record[this.key]);
                 this.buffered_records_to_check.push(record);
-        	}
+            }
         },
 
         on_clear_records: function()