Skip to content

Commit e34d7a6

Browse files
wgs1862019wgs1862019
committed
Merge branch 'development' into 104
2 parents c40e1ba + 9be0e5c commit e34d7a6

File tree

326 files changed

+1165
-891
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

326 files changed

+1165
-891
lines changed

‎README.md‎

100644100755
File mode changed.

‎api.py‎

100644100755
File mode changed.

‎api/.~c9_invoke_4aFiKf.py‎

Lines changed: 0 additions & 64 deletions
This file was deleted.

‎api/API/__init__.py‎

100644100755
File mode changed.

‎api/API/bnumbers.py‎

100644100755
File mode changed.

‎api/API/budget.py‎

100644100755
File mode changed.

‎api/API/collaborators.py‎

100644100755
File mode changed.

‎api/API/committee.py‎

100644100755
Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,10 @@ def getCommitteeMembers():
77
Returns:
88
LDAPFaculty Select Query: The committee members
99
"""
10-
return (LDAPFaculty.select()
11-
.where(LDAPFaculty.isCommitteeMember == True))
12-
10+
return (LDAPFaculty.select(LDAPFaculty.username)
11+
.where(LDAPFaculty.isCommitteeMember == True)
12+
)
13+
1314

1415
def removeCommitteeMembers(commiteeList):
1516
"""removes the committee members from a list
@@ -21,11 +22,10 @@ def removeCommitteeMembers(commiteeList):
2122
int: The number of rows changed
2223
"""
2324

24-
removeQuery = (LDAPFaculty.update(isCommitteeMember = False)
25-
.where(LDAPFaculty.isCommitteeMember == True) # currentCommittee Members
26-
.where(~(LDAPFaculty.fID << commiteeList))) # not in the list passed through
25+
makeCommitteeMembers = (LDAPFaculty.update(isCommitteeMember = False)
26+
.where(LDAPFaculty.fID << commiteeList))
2727

28-
return removeQuery.execute()
28+
return makeCommitteeMembers.execute()
2929

3030

3131
def addCommitteeMembers(desiredCommitteeList):

‎api/API/faculty.py‎

100644100755
Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -140,9 +140,9 @@ def getFacultyWithAcceptedProjects(year=None):
140140
.where(Projects.status == cfg["projectStatus"]["Accept"])
141141
)
142142
if year is not None:
143-
facQ.where(Projects.year == year)
144-
if facQ.exists():
145-
return facQ.execute()
143+
facQ = facQ.where(Projects.year == year).execute()
144+
if facQ:
145+
return facQ
146146
else:
147147
return None
148148

‎api/API/files.py‎

100644100755
Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,9 @@ def create_message(subject, recipients, body):
3030
username_email(s) - Emails of the recipients
3131
body - The body of the email
3232
'''
33+
3334
msg = Message(subject,
34-
sender=app.config['MAIL_USERNAME'],
35+
sender=app.config['MAIL_DEFAULT_SENDER'],
3536
recipients=[recipients]) #create a message instance
3637
msg.html = body
3738
return msg

0 commit comments

Comments
 (0)