Merge branch 'issue_813_eventList' of github.com:BCStudentSoftwareDev…

…Team/celts into issue_813_eventList
BCStudentSoftwareDevTeam · Jul 18, 2023 · c40e6f9 · c40e6f9
2 parents c394590 + d0c48fe
commit c40e6f9
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/app/templates/events/event_list.html b/app/templates/events/event_list.html
@@ -28,7 +28,7 @@ <h1 class="text-center">Events List for {{selectedTerm.description}}</h1>
       </div>
     </div>
   </div>
-  {% if user.isAdmin %}
+  {% if selectedTerm == g.current_term and user.isAdmin %}
     <div class="row px-4">
       <div class = "d-none d-sm-block col "></div>
       <div class="form-check form-switch mb-2 col-auto">
@@ -77,8 +77,8 @@ <h1 class="text-center">Events List for {{selectedTerm.description}}</h1>
         </tr>
       </thead>
       <tbody>
-        {% if events[-1].isPast %}          
-          <tr> There are no upcoming events for this term </tr>
+        {% if selectedTerm == g.current_term and events[-1].isPast %}          
+          <tr> There are no upcoming events for this program </tr>
         {% endif %}
         {% for event in events %}
           <tr>
@@ -161,7 +161,7 @@ <h1 class="text-center">Events List for {{selectedTerm.description}}</h1>
     </table>
   </div>
 {% else %}
-  <p>No upcoming events for this term</p>
+    <p>There are no events for this program</p>
 {% endif %}
 {% endmacro %}