Skip to content

#253 Bugfix: 500 Error on Hackadmin page #258

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

Merged
stefdworschak merged 6 commits into from
Dec 9, 2021
Merged

#253 Bugfix: 500 Error on Hackadmin page #258

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
e86250b
Pull changes from upstream and update
Sarosim Oct 26, 2020
235254d
Pull upstream 30/10
Sarosim Oct 30, 2020
98b873a
Pulling the latest changes from upstream - 27/11/2020
Sarosim Nov 27, 2020
2f0ea76
Pulling upstream master
Sarosim Dec 7, 2021
fc7c6bb
Initial commit on bug-fix #253 branch
Sarosim Dec 7, 2021
e047096
Fix Bug#253
Sarosim Dec 8, 2021
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
21 changes: 11 additions & 10 deletions hackadmin/helpers.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,16 +63,17 @@ def extract_badges_for_hackathon(hackathon, issue_date, format='json'):

badges.setdefault('facilitators', [])
for team in hackathon.teams.all():
badges['facilitators'].append({
'first_name': team.mentor.first_name,
'name': team.mentor.full_name or team.mentor.slack_display_name,
'email': team.mentor.email,
'issue_date': issue_date,
'team': team.display_name,
'project': team.project.display_name if team.project else '',
'award': 'Hackathon Facilitators',
'award_ranking': 'n/a',
})
if team.mentor:
badges['facilitators'].append({
'first_name': team.mentor.first_name,
'name': team.mentor.full_name or team.mentor.slack_display_name,
'email': team.mentor.email,
'issue_date': issue_date,
'team': team.display_name,
'project': team.project.display_name if team.project else '',
'award': 'Hackathon Facilitators',
'award_ranking': 'n/a',
})

projects = [team.project for team in hackathon.teams.all()
if team.project]
Expand Down
1 change: 0 additions & 1 deletion hackadmin/views.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,6 @@ def hackathon_participants(request, hackathon_id):
hackathon, date.today().isoformat()).items()
for awardee in values
if category not in ['participants', 'judges', 'facilitators']]
print(awardees)
return render(request, 'hackadmin_participants.html', {
'hackathon': hackathon,
'mentors': mentors,
Expand Down