Move narrative templates to base action admin (#938)

Co-authored-by: Olivier Winter <[email protected]>

Author: k1o0

alyx/actions/admin.py

@@ -213,6 +213,17 @@ def get_form(self, request, obj=None, **kwargs):
         form.last_subject_id = self._get_last_subject(request)
         return form
 
+    def change_view(self, request, object_id, extra_context=None, **kwargs):
+        context = extra_context or {}
+        context = _pass_narrative_templates(context)
+        return super(BaseActionAdmin, self).change_view(
+            request, object_id, extra_context=context, **kwargs)
+
+    def add_view(self, *args, extra_context=None):
+        context = extra_context or {}
+        context = _pass_narrative_templates(context)
+        return super(BaseActionAdmin, self).add_view(*args, extra_context=context)
+
     def formfield_for_foreignkey(self, db_field, request, **kwargs):
         # Logged-in user by default.
         if db_field.name == 'user':
@@ -616,17 +627,6 @@ def get_form(self, request, obj=None, **kwargs):
             ).distinct()
         return form
 
-    def change_view(self, request, object_id, extra_context=None, **kwargs):
-        context = extra_context or {}
-        context = _pass_narrative_templates(context)
-        return super(SessionAdmin, self).change_view(
-            request, object_id, extra_context=context, **kwargs)
-
-    def add_view(self, request, extra_context=None):
-        context = extra_context or {}
-        context = _pass_narrative_templates(context)
-        return super(SessionAdmin, self).add_view(request, extra_context=context)
-
     def project_(self, obj):
         return [getattr(p, 'name', None) for p in obj.projects.all()]
 

alyx/templates/admin/change_form.html

@@ -74,6 +74,7 @@
 
 // Narrative templates
 $(window).on("load", function() {
+    if (!"{{ narrative_templates }}".length) { return; }
     var templates = JSON.parse(atob("{{ narrative_templates }}"));
     $("select[name='procedures']").on("change", function (e) {
        // Do nothing if the narrative is already filled.