Ticket #13743: comments_admin.diff

django/contrib/comments/admin.py

@@ -28 +28 @@
     def get_actions(self, request):
         actions = super(CommentsAdmin, self).get_actions(request)
         # Only superusers should be able to delete the comments from the DB.
-        if not request.user.is_superuser:
+        if not request.user.is_superuser and 'delete_selected' in actions:
             actions.pop('delete_selected')
         if not request.user.has_perm('comments.can_moderate'):
-            actions.pop('approve_comments')
-            actions.pop('remove_comments')
+            if 'approve_comments' in actions:
+                actions.pop('approve_comments')
+            if 'remove_comments' in actions:
+                actions.pop('remove_comments')
         return actions
 
     def flag_comments(self, request, queryset):