fixed update progress tracking
authorJordan Augé <jordan.auge@lip6.fr>
Tue, 8 Jul 2014 08:14:31 +0000 (10:14 +0200)
committerJordan Augé <jordan.auge@lip6.fr>
Tue, 8 Jul 2014 08:14:31 +0000 (10:14 +0200)
manifoldapi/static/js/manifold.js
plugins/apply/static/js/apply.js

index 3bf4257..2108c65 100644 (file)
@@ -1725,7 +1725,8 @@ var manifold = {
                                 }
 
                                 /* Propagate the event to other plugins subscribed to the query */
-                                manifold.raise_query_event(query_uuid, event_type, new_data);
+                                manifold.query_store.recount(query_uuid);
+                                manifold.raise_record_event(query_uuid, event_type, new_data);
 
                                 break;
 
@@ -1777,12 +1778,13 @@ var manifold = {
                                 }
 
                                 /* Propagate the event to other plugins subscribed to the query */
+                                manifold.query_store.recount(query_uuid);
                                 manifold.raise_query_event(query_uuid, event_type, new_data);
                                 break;
                         }
                         break;
                 }
-
+/*
                 // 3. Inform others about the change
                 // a) the main query...
                 manifold.raise_record_event(query_uuid, event_type, data);
@@ -1803,9 +1805,8 @@ var manifold = {
                     });
                     data.key = value_key;
                 }
-
-                manifold.query_store.recount(cur_query.query_uuid);
                 manifold.raise_record_event(cur_query.query_uuid, event_type, data);
+*/
 
                 break;
 
index 75ab765..31d582c 100644 (file)
                             return;
 
                         case STATE_SET_IN_SUCCESS:
-                        case STATE_SET_OUT_SUCCESS:
+                            action = 'ADD';
                             msg   = 'SUCCESS';
                             break;
-
                         case STATE_SET_IN_FAILURE:
+                            action = 'ADD';
+                            msg   = 'FAILURE';
+                            break;
+
+                        case STATE_SET_OUT_SUCCESS:
+                            action = 'REMOVE';
+                            msg   = 'FAILURE';
+                            break;
                         case STATE_SET_OUT_FAILURE:
+                            action = 'REMOVE';
                             msg   = 'FAILURE';
                             break;