Skip to content

fix evals stuff #552

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
BigSpaceships wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

fix evals stuff #552

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions conditional/blueprints/conditional.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,8 +106,8 @@ def conditional_review(user_dict=None):

if status == 'Passed':
account = ldap_get_member(uid)
hp = account.housingPoints
ldap_set_housingpoints(account, hp + 2)
hp = int(account.housingPoints)
ldap_set_housingpoints(account, str(hp + 2))

elif cond_obj.i_evaluation:
FreshmanEvalData.query.filter(FreshmanEvalData.id == cond_obj.i_evaluation).update(
Expand Down
4 changes: 2 additions & 2 deletions conditional/blueprints/slideshow.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,8 +138,8 @@ def slideshow_spring_review(user_dict=None):
if ldap_is_intromember(account):
ldap_set_not_intro_member(account)

hp = account.housingPoints
ldap_set_housingpoints(account, hp + 2)
hp = int(account.housingPoints)
ldap_set_housingpoints(account, str(hp + 2))
elif status == "Failed":
if ldap_is_intromember(account):
ldap_set_failed(account)
Expand Down
4 changes: 2 additions & 2 deletions conditional/util/ldap.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,13 +136,13 @@ def ldap_set_inactive(account):

def ldap_set_intro_member(account):
_ldap_add_member_to_group(account, 'intromembers')
ldap_get_intro_members().cache_clear()
ldap_get_intro_members.cache_clear()
ldap_get_member.cache_clear()


def ldap_set_not_intro_member(account):
_ldap_remove_member_from_group(account, 'intromembers')
ldap_get_intro_members().cache_clear()
ldap_get_intro_members.cache_clear()
ldap_get_member.cache_clear()


Expand Down
Loading