Uses Django Public Admin package

okfn-brasil · Apr 4, 2020 · d6f6490 · d6f6490
1 parent 350e46d
commit d6f6490
Show file tree

Hide file tree

Showing 10 changed files with 16 additions and 182 deletions.
diff --git a/jarbas/dashboard/admin/__init__.py b/jarbas/dashboard/admin/__init__.py
@@ -8,6 +8,8 @@
 from django.db.models import Count, F, Sum
 from django.db.models.functions import Concat
 from django.utils.safestring import mark_safe
+from public_admin.admin import PublicModelAdmin
+from public_admin.sites import PublicAdminSite
 
 from jarbas.chamber_of_deputies.models import (
     Reimbursement,
@@ -18,16 +20,14 @@
 from jarbas.dashboard.admin import list_filters, widgets
 from jarbas.dashboard.admin.paginators import CachedCountPaginator
 from jarbas.dashboard.admin.subquotas import Subquotas
-from jarbas.public_admin.admin import PublicAdminModelAdmin
-from jarbas.public_admin.sites import public_admin
 
 
 ALL_FIELDS = sorted(Reimbursement._meta.fields, key=lambda f: f.verbose_name)
 CUSTOM_WIDGETS = ('receipt_url', 'subquota_description', 'suspicions')
 READONLY_FIELDS = (f.name for f in ALL_FIELDS if f.name not in CUSTOM_WIDGETS)
 
 
-class ReimbursementModelAdmin(PublicAdminModelAdmin):
+class ReimbursementModelAdmin(PublicModelAdmin):
 
     list_display = (
         'short_document_id',
@@ -183,7 +183,7 @@ def get_search_results(self, request, queryset, search_term):
         return queryset, distinct
 
 
-class ReimbursementSummaryModelAdmin(PublicAdminModelAdmin):
+class ReimbursementSummaryModelAdmin(PublicModelAdmin):
     change_list_template = 'dashboard/reimbursement_summary_change_list.html'
     list_filter = (
         list_filters.SuspiciousListFilter,
@@ -307,5 +307,15 @@ def changelist_view(self, request, extra=None):
         return response
 
 
+class JarbasPublicAdminSite(PublicAdminSite):
+    site_title = 'Dashboard'
+    site_header = 'Jarbas Dashboard'
+    index_title = 'Jarbas'
+
+
+public_admin = JarbasPublicAdminSite(
+    public_apps=('chamber_of_deputies',),
+    public_models=('reimbursements',)
+)
 public_admin.register(Reimbursement, ReimbursementModelAdmin)
 public_admin.register(ReimbursementSummary, ReimbursementSummaryModelAdmin)
diff --git a/jarbas/dashboard/templates/admin/base_site.html b/jarbas/dashboard/templates/admin/base_site.html
diff --git a/jarbas/dashboard/urls.py b/jarbas/dashboard/urls.py
@@ -1,6 +1,6 @@
 from django.urls import path
 
-from jarbas.public_admin.sites import public_admin
+from jarbas.dashboard.admin import public_admin
 
 
 urlpatterns = [

diff --git a/jarbas/public_admin/__init__.py b/jarbas/public_admin/__init__.py
diff --git a/jarbas/public_admin/admin.py b/jarbas/public_admin/admin.py
diff --git a/jarbas/public_admin/sites.py b/jarbas/public_admin/sites.py
diff --git a/jarbas/public_admin/tests/__init__.py b/jarbas/public_admin/tests/__init__.py
diff --git a/jarbas/public_admin/tests/test_dummy_user.py b/jarbas/public_admin/tests/test_dummy_user.py
diff --git a/jarbas/public_admin/tests/test_public_admin_site.py b/jarbas/public_admin/tests/test_public_admin_site.py
diff --git a/requirements.txt b/requirements.txt
@@ -7,6 +7,7 @@ django-bulk-update==2.2.0
 django-cors-middleware==1.3.1
 django-debug-toolbar==1.11
 django-extensions==2.1.6
+django-public-admin==0.0.1
 django-test-without-migrations==0.6
 djangorestframework==3.9.1
 freezegun==0.3.11