A researcher can associate a poll for many pollsters.

1 files changed, 5 insertions, 11 deletions

diff --git a/webapp/polls/views.py b/webapp/polls/views.py
index 5966b0f..124f356 100644
--- a/webapp/polls/views.py
+++ b/webapp/polls/views.py
@@ -84,16 +84,11 @@ class PollFormView(FormView):
                 raise Http404()
 
         poll = Poll(data=form.data) if form.is_bound else poll
-        pollster_id = None
-        if hasattr(poll.pollster, 'id'):
-            pollster_id = str(poll.pollster.id)
-        else:
-            pollster_id = poll.pollster
         context.update({
             "poll": poll,
+            "pollsters_id": map(lambda p: str(p.id), poll.get_pollsters()),
             "STATUS_CHOICES": Poll.status_choices(),
-            "POLLSTER_CHOICES": form.fields['pollster'].choices,
-            "pollster_id": pollster_id
+            "POLLSTER_CHOICES": form.fields['pollsters'].choices,
         })
         return context
 
@@ -140,15 +135,14 @@ class PollListView(ListView):
 
     def get_queryset(self, *args, **kwargs):
         user = self.request.user
-        pollster_username = lambda poll: (
-            poll.get_pollster().username if poll.get_pollster() else
-            "Sin asignar")
+        assigned_to = lambda poll: ", ".join(
+            map(lambda p: p.username, poll.get_pollsters()))
         return [
             {
                 'name': poll.name.capitalize(),
                 'status': poll.status,
                 'is_open': poll.is_open(),
-                'assigned_to': pollster_username(poll).capitalize(),
+                'assigned_to': assigned_to(poll) if assigned_to(poll) else "-",
                 'action_result_view': {
                     'disabled': "disabled" if not poll.get_result() else "",
                     'url': reverse(