Last minute live changes 2019-04-23:1

huntserver/hunt_views.py

@@ -374,6 +374,8 @@ def chat(request):
     else:
         if(team is None):
             return render(request, 'access_error.html', {'reason': "team"})
+        if(team.hunt.is_locked):
+            return render(request, 'access_error.html', {'reason': "hunt"})
         if request.is_ajax():
             messages = Message.objects.filter(pk__gt=request.GET.get("last_pk"))
         else:

huntserver/info_views.py

@@ -1,4 +1,5 @@
 from django.contrib.auth.decorators import login_required
+from django.db.models.functions import Lower
 from django.shortcuts import render
 from django.contrib import messages
 import random
@@ -91,7 +92,7 @@ def registration(request):
         return render(request, "registration.html",
                       {'registered_team': team, 'curr_hunt': curr_hunt})
     else:
-        teams = curr_hunt.real_teams
+        teams = curr_hunt.real_teams.order_by(Lower('team_name'))
         return render(request, "registration.html",
                       {'teams': teams, 'curr_hunt': curr_hunt})
 

huntserver/staff_views.py

@@ -12,6 +12,7 @@
 from django.utils import timezone
 from django.contrib import messages
 from django.db.models import F
+from django.db.models.functions import Lower
 from huey.contrib.djhuey import result
 import itertools
 import json
@@ -386,7 +387,7 @@ def admin_chat(request):
     if request.is_ajax() or request.method == 'POST':
         return HttpResponse(json.dumps(context))
     else:
-        teams = curr_hunt.team_set.order_by("team_name").all()
+        teams = curr_hunt.team_set.order_by(Lower("team_name")).all()
         context['teams'] = teams
         return render(request, 'staff_chat.html', add_apps_to_context(context, request))
 

huntserver/templates/staff_chat.html

@@ -17,9 +17,9 @@
   <h1> Staff Chat </h1>
   <div class="container">
     <div class="row">
-      <div id="button_container" class="content col-sm-4 col-md-3">
+      <div id="button_container" class="content col-sm-5 col-md-4">
         {% for team in teams %}
-          <button style="width:45%" data-id='{{ team.pk }}' data-full_name="{{ team.team_name }}" class="chatselect">
+          <button style="width:31%" data-id='{{ team.pk }}' data-full_name="{{ team.team_name }}" class="chatselect">
             {{ team.team_name|truncatechars:12 }}
           </button>