Merge pull request #2563 from IFRCGo/feature/admin-page-to-query-users

Expose Permissions query entry under Authentication and Authorization

Author: szabozoltan69

api/admin.py

@@ -4,7 +4,7 @@
 from django.conf import settings
 from django.contrib import admin, messages
 from django.contrib.auth.admin import UserAdmin
-from django.contrib.auth.models import User
+from django.contrib.auth.models import Permission, User
 from django.contrib.gis import admin as geoadmin
 from django.core.exceptions import ValidationError
 from django.http import HttpResponse, HttpResponseRedirect
@@ -1052,6 +1052,40 @@ class ExportTokenAdmin(admin.ModelAdmin):
     pass
 
 
+try:
+    admin.site.unregister(Permission)
+except admin.sites.NotRegistered:
+    pass
+
+
+@admin.register(Permission)
+class PermissionReportAdmin(admin.ModelAdmin):
+    # Show the menu entry, but route to the Users-per-permission report.
+    def has_module_permission(self, request):
+        from api.admin_reports import _user_has_access
+
+        return _user_has_access(request.user)
+
+    def has_view_permission(self, request, obj=None):
+        from api.admin_reports import _user_has_access
+
+        return _user_has_access(request.user)
+
+    def has_add_permission(self, request):
+        return False
+
+    def has_change_permission(self, request, obj=None):
+        return False
+
+    def has_delete_permission(self, request, obj=None):
+        return False
+
+    def changelist_view(self, request, extra_context=None):
+        from api.admin_reports import users_per_permission_view
+
+        return users_per_permission_view(request)
+
+
 admin.site.register(models.DisasterType, DisasterTypeAdmin)
 admin.site.register(models.Event, EventAdmin)
 admin.site.register(models.GDACSEvent, GdacsAdmin)

api/templates/admin/users_per_permission.html

@@ -45,6 +45,7 @@
             <th>{% trans "Username" %}</th>
             <th>{% trans "Email address" %}</th>
             <th>{% trans "Name" %}</th>
+            <th>{% trans "Ctry" %}</th>
             <th>{% trans "Organization" %}</th>
             <th>{% trans "Active" %}</th>
             <th>{% trans "Staff" %}</th>
@@ -58,6 +59,7 @@
             <td>{{ u.username }}</td>
             <td>{{ u.email }}</td>
             <td>{{ u.get_full_name }}</td>
+            <td>{{ u.profile.country.iso3|default_if_none:"" }}</td>
             <td>{{ u.profile.org|default_if_none:"" }}</td>
             <!-- yesno:"+,," -> '+' for True, '' for False/None -->
             <td class="bool-col">{{ u.is_active|yesno:"+,," }}</td>