rebased and resolved conflicts

edx_proctoring/serializers.py

@@ -85,7 +85,7 @@ class ProctoredExamStudentAllowanceSerializer(serializers.ModelSerializer):
     Serializer for the ProctoredExamStudentAllowance Model.
     """
     proctored_exam = ProctoredExamSerializer()
-    user = serializers.SerializerMethodField('get_user')
+    user = UserSerializer()
 
     class Meta:
         """
@@ -95,9 +95,3 @@ class ProctoredExamStudentAllowanceSerializer(serializers.ModelSerializer):
         fields = (
             "id", "created", "modified", "user", "key", "value", "proctored_exam"
         )
-
-    def get_user(self, allowance_object):
-        """
-        returns the user object in a serialized form
-        """
-        return UserSerializer(User.objects.get(id=allowance_object.user_id)).data

edx_proctoring/static/proctoring/templates/course_allowances.underscore

@@ -26,12 +26,17 @@
                     <td>
                     <%- interpolate(gettext(' %(exam_display_name)s '), { exam_display_name: proctored_exam_allowance.proctored_exam.exam_name }, true) %>
                     </td>
+                    <% if (proctored_exam_allowance.user){ %>
                     <td>
                      <%- interpolate(gettext(' %(username)s '), { username: proctored_exam_allowance.user.username }, true) %>
                      </td>
                     <td>
                     <%- interpolate(gettext(' %(email)s '), { email: proctored_exam_allowance.user.email }, true) %>
                     </td>
+                    <% }else{ %>
+                        <td>N/A</td>
+                        <td>N/A</td>
+                    <% } %>
                     <td>
                     <%- interpolate(gettext(' %(allowance_name)s '), { allowance_name: proctored_exam_allowance.key }, true) %>
                     </td>