Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/edx/edx-platform

Browse Source
This commit is contained in:
Julia Hansbrough
2013-09-19 10:50:46 -04:00
parent 14eadb24d6 46fddc6d26
commit 5efa0c4578
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
lms/djangoapps/open_ended_grading/open_ended_notifications.py
View File

@@ -154,8 +154,9 @@ def combined_notifications(course, user):
controller_response = controller_qs.check_combined_notifications(course.id, student_id, user_is_staff,
last_time_viewed)
notifications = json.loads(controller_response)
if notifications['success']:
if notifications['staff_needs_to_grade'] or notifications['student_needs_to_peer_grade']:
if notifications.get('success'):
if (notifications.get('staff_needs_to_grade') or
notifications.get('student_needs_to_peer_grade')):
pending_grading = True
except:
#Non catastrophic error, so no real action