modified: docker-compose.yml

modified: whatisit/apps/wordfish/views.py modified: whatisit/settings.py
radinformatics · Dec 24, 2016 · cd7c509 · cd7c509
1 parent 69a4d0a
commit cd7c509
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -38,7 +38,7 @@ redis:
 
 worker:
   image: vanessa/whatisit
-  command: celery worker -A whatisit.celery -Q default -n default@%h
+  command: celery worker -A whatisit.celery -Q default -l debug -n default@%h
   volumes:
     - .:/code
   volumes_from:

diff --git a/whatisit/apps/wordfish/views.py b/whatisit/apps/wordfish/views.py
@@ -868,8 +868,9 @@ def bulk_annotate(request,cid,sid=None):
             seen_annotations = []
             for selection_key in selection_keys:
                 name = selection_key.replace("whatisit||","")
-                label = request.POST.get(selection_key,"")[0]
+                label = request.POST.get(selection_key,"")
                 if label != "":
+
                     allowed_annotation = AllowedAnnotation.objects.get(name=name,
                                                                        label=label)
 
@@ -879,17 +880,15 @@ def bulk_annotate(request,cid,sid=None):
 
                     for report in reports:
                         # Update user annotation sent to celery to run async
-                        update_user_annotation.apply_async(kwargs={'user':user.id, 
+                        update_user_annotation.apply_async(kwargs={'user':request.user.id, 
                                                                    'allowed_annotation':allowed_annotation.id,
                                                                    'report':report.id})
                         #result = update_user_annotation.apply_async([user.id,
                         #                                             allowed_annotation.id,
                         #                                             report.id])
 
                     messages.info(request,"Annotation %s:%s task running for %s reports" %(name,label,reports.count()))
-                else:
-                    messages.error(request,"Could not bulk annotate %s." %(name))
-
+
                 return view_report_collection(request,cid)
 
         # Otherwise just render the form

diff --git a/whatisit/settings.py b/whatisit/settings.py
@@ -10,6 +10,7 @@
 https://docs.djangoproject.com/en/1.9/ref/settings/
 """
 
+from kombu import Exchange, Queue
 import os
 
 # Build paths inside the project like this: os.path.join(BASE_DIR, ...)