Merge pull request #879 from rdmorganiser/fix_options

Fix options endpoint for option set providers
rdmorganiser · Dec 21, 2023 · bb58bf2 · bb58bf2
2 parents d4266af + 0459498
commit bb58bf2
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/rdmo/projects/templates/projects/project_questions_form_group_autocomplete.html b/rdmo/projects/templates/projects/project_questions_form_group_autocomplete.html
@@ -38,8 +38,7 @@
                             <li ng-repeat="option in value.items"
                                 ng-class="{'active': option.active}"
                                 ng-mousedown="service.selectAutocomplete(value, option)">
-                                <span ng-show="option.text_and_help">{$ option.text_and_help $}</span>
-                                <span ng-show="option.text">{$ option.text $}</span>
+                                {$ option.text_and_help $}
                             </li>
                         </ul>
                     </div>

diff --git a/rdmo/projects/viewsets.py b/rdmo/projects/viewsets.py
@@ -154,7 +154,6 @@ def resolve(self, request, pk=None):
     @action(detail=True, permission_classes=(HasModelPermission | HasProjectPermission, ))
     def options(self, request, pk=None):
         project = self.get_object()
-
         try:
             try:
                 optionset_id = request.GET.get('optionset')
@@ -163,9 +162,13 @@ def options(self, request, pk=None):
                 raise NotFound() from e
 
             # check if the optionset belongs to this catalog and if it has a provider
+            project.catalog.prefetch_elements()
             if Question.objects.filter_by_catalog(project.catalog).filter(optionsets=optionset) and \
                     optionset.provider is not None:
-                options = optionset.provider.get_options(project, search=request.GET.get('search'))
+                options = [
+                    dict(**option, text_and_help=option.get('text_and_help', 'text'))
+                    for option in optionset.provider.get_options(project, search=request.GET.get('search'))
+                ]
                 return Response(options)
 
         except OptionSet.DoesNotExist: