diff --git a/Dockerfile b/Dockerfile index d6d22609..82e18878 100644 --- a/Dockerfile +++ b/Dockerfile @@ -28,4 +28,4 @@ RUN curl -sL https://deb.nodesource.com/setup_10.x | bash - && \ RUN ln -sf /usr/share/zoneinfo/America/New_York /etc/localtime -CMD ["gunicorn", "packet:app", "--bind=0.0.0.0:8080", "--access-logfile=-"] +CMD ["gunicorn", "packet:app", "--bind=0.0.0.0:8080", "--access-logfile=-", "--timeout=600"] diff --git a/package.json b/package.json index 6cc93f51..8e362207 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "title": "CSH Packet", "name": "csh-packet", - "version": "3.3.1", + "version": "3.3.2", "description": "A web app implementation of the CSH introductory packet.", "bugs": { "url": "https://github.com/ComputerScienceHouse/packet/issues", diff --git a/packet/commands.py b/packet/commands.py index 5b290cfd..f1402c68 100644 --- a/packet/commands.py +++ b/packet/commands.py @@ -260,7 +260,7 @@ def extend_packet(packet_id): else: print("Ready to extend packet #{} for {}".format(packet_id, packet.freshman_username)) - packet.end = input_date("Enter the new end date for this packet") + packet.end = datetime.combine(input_date("Enter the new end date for this packet"), packet_end_time) db.session.commit() print("Packet successfully extended") diff --git a/packet/context_processors.py b/packet/context_processors.py index 8aade420..8abe02df 100644 --- a/packet/context_processors.py +++ b/packet/context_processors.py @@ -12,6 +12,7 @@ # pylint: disable=bare-except +@lru_cache(maxsize=128) def get_csh_name(username): try: member = ldap_get_member(username) diff --git a/packet/ldap.py b/packet/ldap.py index 79a1abfd..4068ecd7 100644 --- a/packet/ldap.py +++ b/packet/ldap.py @@ -144,6 +144,8 @@ def ldap_get_eboard_role(member): return_val = "R&D" elif _ldap_is_member_of_group(member, "eboard-social"): return_val = "Social" + elif _ldap_is_member_of_group(member, "eboard-secretary"): + return_val = "Secretary" return return_val diff --git a/packet/templates/active_packets.html b/packet/templates/active_packets.html index ad3c9889..2be6984d 100644 --- a/packet/templates/active_packets.html +++ b/packet/templates/active_packets.html @@ -47,12 +47,12 @@