Merge pull request #238 from ComputerScienceHouse/develop

Setting rit_username to proper location

Author: mxmeinhold

conditional/blueprints/member_management.py

@@ -211,7 +211,7 @@ def member_management_uploaduser(user_dict=None):
                 rit_username = None
 
             log.info('Create Freshman Account for {} via CSV Upload'.format(name))
-            db.session.add(FreshmanAccount(name, onfloor_status, room_number, rit_username))
+            db.session.add(FreshmanAccount(name, onfloor_status, room_number, None, rit_username))
 
         db.session.flush()
         db.session.commit()

requirements.txt

@@ -2,7 +2,7 @@ alembic~=0.9.8
 astroid~=2.2.5
 blinker~=1.4
 click~=6.7
-csh-ldap~=2.0.2
+csh-ldap~=2.2
 Flask~=1.1.0
 Flask-Migrate~=2.1.1
 Flask-Gzip~=0.2