X-Git-Url: https://git.mdrn.pl/edumed.git/blobdiff_plain/6c9978c5bf8b1ef20871557c22b8b02df647d700..8c1dffb8e0ff68da428ad1e50b4daada6dbcb5b0:/wtem/admin.py diff --git a/wtem/admin.py b/wtem/admin.py index 56a687d..93fd652 100644 --- a/wtem/admin.py +++ b/wtem/admin.py @@ -155,8 +155,7 @@ class SubmissionAdmin(admin.ModelAdmin): def get_form(self, request, obj=None, **kwargs): return get_form(request, obj) - @staticmethod - def submitted_by(instance): + def submitted_by(self, instance): if instance.contact: return '%s' % ( reverse('admin:contact_contact_change', args=[instance.contact.id]), @@ -166,16 +165,14 @@ class SubmissionAdmin(admin.ModelAdmin): submitted_by.allow_tags = True submitted_by.short_description = "Zgłoszony/a przez" - @staticmethod - def todo(submission): + def todo(self, submission): user = get_current_request().user user_exercises = get_user_exercises(user) user_marks = submission.marks.get(str(user.id), {}) return ','.join([str(e['id']) for e in user_exercises if str(e['id']) not in user_marks.keys()]) todo.short_description = 'Twoje nieocenione zadania' - @staticmethod - def examiners_repr(submission): + def examiners_repr(self, submission): return ', '.join([u.username for u in submission.examiners.all()]) examiners_repr.short_description = 'Przypisani do zgłoszenia' @@ -227,6 +224,9 @@ class SubmissionsSet: examiners = self.examiners_by_exercise.setdefault(exercise_id, []) if user not in examiners: examiners.append(user) + if submission.contact: + contact_body = submission.contact.body + submission.school = '%s %s' % (contact_body.get('school'), contact_body.get('school_address')) def report_view(request):