Change volunteer checklist items to show links in the correct order

Fixes https://jira.magfest.net/browse/MAGDEV-348. This should really not be hard-coded into the templates, but it's a little late to fix it the right way.
magfest · Nov 14, 2018 · 6e4d354 · 6e4d354
1 parent 0e59ab8
commit 6e4d354
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/uber/templates/hotel_requests/hotel_item.html b/uber/templates/hotel_requests/hotel_item.html
@@ -15,7 +15,7 @@
     {% if c.BEFORE_ROOM_DEADLINE %}
         <li>
             {{ macros.checklist_image(attendee.hotel_requests) }}
-            {% if not attendee.placeholder and attendee.food_restrictions_filled_out and attendee.shirt_info_marked and not attendee.hotel_requests %}
+            {% if not attendee.placeholder and attendee.food_restrictions_filled_out and not attendee.hotel_requests %}
                 <a href="../hotel_requests">Tell us</a>
             {% else %}
                 Tell us

diff --git a/uber/templates/signups/food_item.html b/uber/templates/signups/food_item.html
@@ -2,7 +2,7 @@
 
 <li>
     {{ macros.checklist_image(attendee.food_restrictions) }}
-    {% if not attendee.placeholder and attendee.shirt_info_marked %}
+    {% if not attendee.placeholder %}
         <a href="food_restrictions">Let us know</a>
     {% else %}
         Let us know

diff --git a/uber/templates/signups/shirt_item.html b/uber/templates/signups/shirt_item.html
@@ -2,7 +2,7 @@
 
 <li>
     {{ macros.checklist_image(attendee.shirt_info_marked) }}
-    {% if not attendee.placeholder %}
+    {% if not attendee.placeholder and attendee.food_restrictions_filled_out and (not self.hotel_eligible or self.hotel_requests or not c.BEFORE_ROOM_DEADLINE) %}
         <a href="shirt_size">Let us know</a>
     {% else %}
         Let us know