Merge branch '0.9.x' of github.com:pricingassistant/mrq into 0.9.x

* '0.9.x' of github.com:pricingassistant/mrq:
  cancel edgecases
  fix task cancelation

Author: sylvinus

mrq/basetasks/utils.py

@@ -38,9 +38,6 @@ def build_query(self):
         if self.params.get("id"):
             query["_id"] = ObjectId(self.params.get("id"))
 
-        if current_job and current_job.data.get("datequeued"):
-            query["datequeued"] = {"$lte": current_job.data["datequeued"]}
-
         # TODO use redis for queue
         for k in [
                 "queue",
@@ -62,6 +59,9 @@ def build_query(self):
 
             for key in params_dict:
                 query["params.%s" % key] = params_dict[key]
+                
+        if current_job and "_id" not in query:
+            query["_id"] = {"$lte": current_job.id}
 
         return query