Merge pull request #3479 from mozilla/revert-revisions-ban-1203403

Bug 1203403 - Revert commit aad6fce
mdn · Sep 10, 2015 · 4f6ae1c · 4f6ae1c
2 parents d38c957 + 976351f
commit 4f6ae1c
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/kuma/dashboards/templates/dashboards/includes/revision_dashboard_body.html b/kuma/dashboards/templates/dashboards/includes/revision_dashboard_body.html
@@ -49,9 +49,10 @@
                     <br/><a class="dashboard-ban-ip-link" href="{{ ban_ip_url }}" target="_blank">{{ _('Ban IP from Editing') }}</a>
                     </span>
                     {% endif %}
-                    {% if request.user.is_superuser and revision.creator.active_ban %}
+                    {% set active_ban = revision.creator.active_ban %}
+                    {% if request.user.is_superuser and active_ban %}
                         <div class="banned">
-                            banned {{ datetimeformat(revision.creator.active_ban.date, format='date') }}
+                            banned {{ datetimeformat(active_ban.date, format='date') }}
                             by {{ active_ban.by }}
                         </div>
                     {% endif %}

diff --git a/kuma/dashboards/views.py b/kuma/dashboards/views.py
@@ -21,7 +21,7 @@ def revisions(request):
     filter_form = RevisionDashboardForm(request.GET)
     page = request.GET.get('page', 1)
 
-    revisions = (Revision.objects.prefetch_related('creator',
+    revisions = (Revision.objects.prefetch_related('creator__bans',
                                                    'document')
                                  .order_by('-created')
                                  .defer('content'))