Make selecting contributor optional on project creation form.

Goodly · Nov 25, 2017 · b02a4b1 · b02a4b1
1 parent ff1b9a5
commit b02a4b1
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/researcher/forms.py b/researcher/forms.py
@@ -78,10 +78,11 @@ class CreateProjectForm(forms.Form):
     starting_article_id = forms.IntegerField(min_value=0)
     ending_article_id = forms.IntegerField(min_value=0)
 
-    contributor_id = SelectContributorId(Contributor.objects.all(),
+    contributor_id = SelectContributorId(
+                                Contributor.objects.order_by("id").all(),
                                 label="Contributor",
-                                empty_label=None,
-                                help_text=help_select_contributors)
+                                help_text=help_select_contributors
+    )
 
     # TODO: show min tokens only after Quiz is selected
     min_tokens_per_highlight = forms.IntegerField(min_value=0)

diff --git a/researcher/views.py b/researcher/views.py
@@ -27,7 +27,7 @@
 from data.pybossa_api import generate_tasks_worker
 from data.pybossa_api import generate_get_taskruns_worker
 from data.nlp_exporter import generate_nlp_tasks_worker
-from thresher.models import Article, Topic, UserProfile, Project
+from thresher.models import Article, Topic, UserProfile, Project, Contributor
 from thresher.models import ParserError
 
 def showParserErrorMessages(request):
@@ -201,13 +201,17 @@ def __init__(self, **kwargs):
     def get(self, request):
         agg = Article.objects.aggregate(Min('id'), Max('id'))
         profile = request.user.userprofile
+        contributor = None
+        if Contributor.objects.count() > 0:
+            contributor = Contributor.objects.order_by("id").first()
         # Developers can add "?debugPresenter=true" to the URL to
         # have the task presenter set to a script tag pointed at
         # the developer's localhost running 'npm run dev' for
         # easy debugging in the Pybossa page context.
         debug_presenter = request.GET.get("debugPresenter", False)
         initial = { 'starting_article_id': agg['id__min'],
                     'ending_article_id': agg['id__max'],
+                    'contributor_id': contributor,
                     'min_tokens_per_highlight': 1,
                     'max_tokens_per_highlight': 10000,
                     'pybossa_url': profile.pybossa_url,