Merge pull request #315 from Mstrodl/hotfix/freshmen-accounts

Fix 500 on dashboard for non-upgraded accounts

Author: galenguyer

Dockerfile

@@ -1,4 +1,4 @@
-FROM python:3.8-buster
+FROM docker.io/python:3.8-buster
 MAINTAINER Devin Matte <matted@csh.rit.edu>
 
 RUN mkdir /opt/conditional

conditional/blueprints/dashboard.py

@@ -44,7 +44,7 @@ def display_dashboard(user_dict=None):
     if ldap_is_intromember(user_dict['account']):
         data['freshman'] = get_freshman_data(user_dict['account'].uid)
     else:
-        data['freshman'] = False
+        data['freshman'] = None
 
     spring = {}
     c_meetings = get_cm(user_dict['account'])

conditional/templates/dashboard.html

@@ -29,7 +29,7 @@ <h5 class="email">{{username}}@csh.rit.edu</h5>
     <div class="row" data-module="masonry">
         <div class="col-lg-6 col-md-6 col-sm-12 col-xs-12">
 
-            {% if freshman != False %}
+            {% if freshman %}
             <div class="panel panel-default">
                 <div class="panel-heading">
                     <h3 class="panel-title">Freshman Evaluations

conditional/util/member.py

@@ -75,6 +75,8 @@ def get_freshman_data(user_name):
     freshman = {}
     freshman_data = FreshmanEvalData.query.filter(FreshmanEvalData.uid == user_name).first()
 
+    if freshman_data is None:
+        return None
     freshman['status'] = freshman_data.freshman_eval_result
     # number of committee meetings attended
     c_meetings = [m.meeting_id for m in