Don't display or accept submissions from deleted profiles

p2pu · Oct 10, 2012 · 39080e3 · 39080e3
1 parent 98694a8
commit 39080e3
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/lernanta/apps/badges/models.py b/lernanta/apps/badges/models.py
@@ -194,6 +194,8 @@ def can_post_submission(self, user):
             return False
         if user.is_authenticated():
             profile = user.get_profile()
+            if not profile.can_post():
+                return False
             if not self.is_eligible(profile):
                 return False
             awards = Award.objects.filter(user=profile, badge=self)

diff --git a/lernanta/apps/badges/templatetags/badge_tags.py b/lernanta/apps/badges/templatetags/badge_tags.py
@@ -18,8 +18,8 @@ def give_badge_action(project, peer):
 
 def badge_submissions(request, pending_page_url, awarded_page_url,
         mine_page_url, toggled_awards, toggled_mine, badge=None):
-    pending_submissions = Submission.objects.filter(pending=True)
-    awarded_submissions = Submission.objects.filter(pending=False)
+    pending_submissions = Submission.objects.filter(author__deleted=False, pending=True)
+    awarded_submissions = Submission.objects.filter(author__deleted=False, pending=False)
     if badge:
         pending_submissions = pending_submissions.filter(badge=badge)
         awarded_submissions = awarded_submissions.filter(badge=badge)