Merge pull request #636 from xchem/m2ms-1489-view

Adds variable to context
xchem · Aug 27, 2024 · 76481ad · 76481ad
2 parents 7a5b4a8 + e0ab265
commit 76481ad
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/viewer/templates/viewer/react_temp.html b/viewer/templates/viewer/react_temp.html
@@ -15,6 +15,9 @@
 
  {% if user.is_authenticated %}
      var DJANGO_CONTEXT ={
+         {% if target_warning_message %}
+         target_warning_message: '{{ target_warning_message }}',
+         {% endif %}
          legacy_url: '{{ legacy_url }}',
          username: '{{ user.username }}',
          email: '{{ user.email|default:"noemail" }}',
@@ -28,6 +31,9 @@
      }
  {% else %}
      var DJANGO_CONTEXT = {
+         {% if target_warning_message %}
+         target_warning_message: '{{ target_warning_message }}',
+         {% endif %}
          legacy_url: '{{ legacy_url }}',
          username: 'NOT_LOGGED_IN',
          email: "noemail",

diff --git a/viewer/views.py b/viewer/views.py
@@ -131,8 +131,7 @@ def react(request):
         if sq2_rv.success and check_squonk_active(request):
             context['squonk_ui_url'] = _SQ2A.get_ui_url()
 
-    if settings.TARGET_WARNING_MESSAGE:
-        context['target_warning_message'] = settings.TARGET_WARNING_MESSAGE
+    context['target_warning_message'] = settings.TARGET_WARNING_MESSAGE
 
     return render(request, "viewer/react_temp.html", context)