Merge pull request #1013 from rdmorganiser/add_user_and_site_to_optio…

…ns_provider Add user and site to options provider (#430)
rdmorganiser · Jul 8, 2024 · 6ddcee6 · 6ddcee6
2 parents 1eaeb5e + c5b4ca0
commit 6ddcee6
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/rdmo/options/providers.py b/rdmo/options/providers.py
@@ -9,13 +9,13 @@ class Provider(Plugin):
     # determines if the page needs to be refreshed after a value is stored
     refresh = False
 
-    def get_options(self, project, search=None):
+    def get_options(self, project, search=None, user=None, site=None):
         raise NotImplementedError
 
 
 class SimpleProvider(Provider):
 
-    def get_options(self, project, search=None):
+    def get_options(self, project, search=None, user=None, site=None):
         return [
             {
                 'id': 'simple_1',

diff --git a/rdmo/projects/viewsets.py b/rdmo/projects/viewsets.py
@@ -201,7 +201,8 @@ def options(self, request, pk=None):
             if Question.objects.filter_by_catalog(project.catalog).filter(optionsets=optionset) and \
                     optionset.provider is not None:
                 options = []
-                for option in optionset.provider.get_options(project, search=request.GET.get('search')):
+                for option in optionset.provider.get_options(project, search=request.GET.get('search'),
+                                                             user=request.user, site=request.site):
                     if 'id' not in option:
                         raise RuntimeError(f"'id' is missing in options of '{optionset.provider.class_name}'")
                     elif 'text' not in option: