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

[unfold.git] / plugins / filter_status / static / js / filter_status.js

diff --git a/plugins/filter_status/static/js/filter_status.js b/plugins/filter_status/static/js/filter_status.js
index d5a13be..9c1c244 100644 (file)
--- a/plugins/filter_status/static/js/filter_status.js
+++ b/plugins/filter_status/static/js/filter_status.js
@@ -70,8 +70,9 @@
     {
         var query_ext;
         
-        switch (data.status) {
+        switch (data.state) {
             case STATE_SET:
+            case STATE_WARNINGS:
                 /* Get the number of pending / unconfigured resources */
                 /* Let's store it in query_ext */
                 query_ext = manifold.query_store.find_analyzed_query_ext(this.options.query_uuid);
@@ -116,9 +117,10 @@
 
             // ... and communicate the appropriate filters to the manager
             // NOTE: we use the manifold namespace for internal filters 
-            if (self.prev_filter_status)
-                manifold.raise_event(self.options.query_uuid, FILTER_REMOVED, self.prev_filter_status);
-
+            if (self.prev_filter_status) {
+                var filter = ['manifold:status', '==', self.prev_filter_status];
+                manifold.raise_event(self.options.query_uuid, FILTER_REMOVED, filter);
+            }
             // XXX The datatables will be refreshed twice !
             if (filter_status != 'all') {
                 // No filter for 'all'