From 60872bb041609bb223c13b2ae62fb9950a60bfb2 Mon Sep 17 00:00:00 2001
From: JasonGrace2282 <aarush.deshpande@gmail.com>
Date: Tue, 1 Oct 2024 20:42:40 -0400
Subject: [PATCH] fix: invalid button logic for dashboard

---
 intranet/templates/dashboard/dashboard.html | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

diff --git a/intranet/templates/dashboard/dashboard.html b/intranet/templates/dashboard/dashboard.html
index 9cebdc6d14..a18fd0dfb0 100644
--- a/intranet/templates/dashboard/dashboard.html
+++ b/intranet/templates/dashboard/dashboard.html
@@ -129,19 +129,15 @@ <h2>{{ dashboard_header }}</h2>
                         <i class="fas fa-plus"></i>
                         Post
                     </a>
-                {% elif "show_all" not in request.GET %}
-                    <a class="button" href="{% url view_announcements_url %}?{% query_transform request show_all=1 %}">
-                        Show All
-                    </a>
                 {% else %}
-                    {% if "show_all" not in request.GET %}
-                        <a class="button" href="{% url view_announcements_url %}?show_all=1">
-                            Show All
-                        </a>
-                    {% else %}
+                    {% if request.GET.show_all is not None and request.GET.show_all != "0" %}
                         <a class="button" href="{% url view_announcements_url %}">
                             <i class="fas fa-times"></i> Don't Show All
                         </a>
+                    {% else %}
+                        <a class="button" href="{% url view_announcements_url %}?{% query_transform request show_all=1 %}">
+                            Show All
+                        </a>
                     {% endif %}
                     <a class="button announcement-add" href="{% url 'add_announcement' %}">
                         <i class="fas fa-plus"></i>
@@ -239,7 +235,7 @@ <h3 class="club-announcements-header">
                     It is currently in beta release and is only available to select clubs.
                     If your club is interested in participating in the rollout, contact
                     <a href="mailto:intranet@tjhsst.edu" class="announcement-link">intranet@tjhsst.edu</a>
-                    . The feature will be released to the entire TJ community in the near future. 
+                    . The feature will be released to the entire TJ community in the near future.
                 </div>
             {% endif %}
             <div class="club-announcement-filters">