From: Jordan Augé <jordan.auge@lip6.fr>
Date: Tue, 8 Jul 2014 08:14:31 +0000 (+0200)
Subject: fixed update progress tracking
X-Git-Tag: myslice-1.1~40
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=0113cb185d725398c7e563d1fbbae86f95dc70af;p=unfold.git

fixed update progress tracking
---

diff --git a/manifoldapi/static/js/manifold.js b/manifoldapi/static/js/manifold.js
index 3bf42572..2108c651 100644
--- a/manifoldapi/static/js/manifold.js
+++ b/manifoldapi/static/js/manifold.js
@@ -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;
 
diff --git a/plugins/apply/static/js/apply.js b/plugins/apply/static/js/apply.js
index 75ab7656..31d582cb 100644
--- a/plugins/apply/static/js/apply.js
+++ b/plugins/apply/static/js/apply.js
@@ -300,12 +300,20 @@
                             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;