Move the WiP warning

Author: tudoramariei

backend/donations/views/dashboard/admin_dashboard.py

@@ -1,8 +1,6 @@
 from typing import Dict, List, Union
 
 from django.conf import settings
-from django.contrib import messages
-from django.template.loader import render_to_string
 from django.urls import reverse
 from django.utils.safestring import mark_safe
 from django.utils.timezone import now
@@ -25,16 +23,6 @@ def callback(request, context) -> Dict:
     today = now()
     years_range_ascending = get_current_year_range()
 
-    messages.warning(
-        request,
-        render_to_string(
-            "admin/announcements/work_in_progress.html",
-            context={
-                "contact_email": settings.CONTACT_EMAIL_ADDRESS,
-            },
-        ),
-    )
-
     header_stats: List[List[Dict[str, Union[str, int]]]] = _get_header_stats(today)
 
     yearly_stats: List[Dict] = _get_yearly_stats(years_range_ascending)

backend/donations/views/dashboard/dashboard.py

@@ -1,14 +1,27 @@
 from django.contrib.auth import get_user_model
+from django.urls import reverse
+from django.contrib import messages
+from django.template.loader import render_to_string
+from django.conf import settings
 
 from .admin_dashboard import callback as admin_callback
-from .ngo_dashboard import callback as ngo_callback
 
 UserModel = get_user_model()
 
 
 def callback(request, context):
     user: UserModel = request.user
 
+    messages.warning(
+        request,
+        render_to_string(
+            "admin/announcements/work_in_progress.html",
+            context={
+                "contact_email": settings.CONTACT_EMAIL_ADDRESS,
+            },
+        ),
+    )
+
     if not user or not user.is_authenticated:
         return context
 

backend/templates/v3/admin/base_admin.html

@@ -23,3 +23,7 @@ <h1 id="site-name">
 {% block content %}
   {% include "unfold/helpers/messages.html" %}
 {% endblock %}
+  
+  {% if display_work_in_progress %}
+    {% include "admin/announcements/work_in_progress.html" %}
+  {% endif %}