Skip to content

Commit d6f6490

Browse files
committed
Uses Django Public Admin package
1 parent 350e46d commit d6f6490

File tree

10 files changed

+16
-182
lines changed

10 files changed

+16
-182
lines changed

jarbas/dashboard/admin/__init__.py

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@
88
from django.db.models import Count, F, Sum
99
from django.db.models.functions import Concat
1010
from django.utils.safestring import mark_safe
11+
from public_admin.admin import PublicModelAdmin
12+
from public_admin.sites import PublicAdminSite
1113

1214
from jarbas.chamber_of_deputies.models import (
1315
Reimbursement,
@@ -18,16 +20,14 @@
1820
from jarbas.dashboard.admin import list_filters, widgets
1921
from jarbas.dashboard.admin.paginators import CachedCountPaginator
2022
from jarbas.dashboard.admin.subquotas import Subquotas
21-
from jarbas.public_admin.admin import PublicAdminModelAdmin
22-
from jarbas.public_admin.sites import public_admin
2323

2424

2525
ALL_FIELDS = sorted(Reimbursement._meta.fields, key=lambda f: f.verbose_name)
2626
CUSTOM_WIDGETS = ('receipt_url', 'subquota_description', 'suspicions')
2727
READONLY_FIELDS = (f.name for f in ALL_FIELDS if f.name not in CUSTOM_WIDGETS)
2828

2929

30-
class ReimbursementModelAdmin(PublicAdminModelAdmin):
30+
class ReimbursementModelAdmin(PublicModelAdmin):
3131

3232
list_display = (
3333
'short_document_id',
@@ -183,7 +183,7 @@ def get_search_results(self, request, queryset, search_term):
183183
return queryset, distinct
184184

185185

186-
class ReimbursementSummaryModelAdmin(PublicAdminModelAdmin):
186+
class ReimbursementSummaryModelAdmin(PublicModelAdmin):
187187
change_list_template = 'dashboard/reimbursement_summary_change_list.html'
188188
list_filter = (
189189
list_filters.SuspiciousListFilter,
@@ -307,5 +307,15 @@ def changelist_view(self, request, extra=None):
307307
return response
308308

309309

310+
class JarbasPublicAdminSite(PublicAdminSite):
311+
site_title = 'Dashboard'
312+
site_header = 'Jarbas Dashboard'
313+
index_title = 'Jarbas'
314+
315+
316+
public_admin = JarbasPublicAdminSite(
317+
public_apps=('chamber_of_deputies',),
318+
public_models=('reimbursements',)
319+
)
310320
public_admin.register(Reimbursement, ReimbursementModelAdmin)
311321
public_admin.register(ReimbursementSummary, ReimbursementSummaryModelAdmin)

jarbas/dashboard/templates/admin/base_site.html

Lines changed: 0 additions & 21 deletions
This file was deleted.

jarbas/dashboard/urls.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
from django.urls import path
22

3-
from jarbas.public_admin.sites import public_admin
3+
from jarbas.dashboard.admin import public_admin
44

55

66
urlpatterns = [

jarbas/public_admin/__init__.py

Whitespace-only changes.

jarbas/public_admin/admin.py

Lines changed: 0 additions & 30 deletions
This file was deleted.

jarbas/public_admin/sites.py

Lines changed: 0 additions & 61 deletions
This file was deleted.

jarbas/public_admin/tests/__init__.py

Whitespace-only changes.

jarbas/public_admin/tests/test_dummy_user.py

Lines changed: 0 additions & 21 deletions
This file was deleted.

jarbas/public_admin/tests/test_public_admin_site.py

Lines changed: 0 additions & 44 deletions
This file was deleted.

requirements.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ django-bulk-update==2.2.0
77
django-cors-middleware==1.3.1
88
django-debug-toolbar==1.11
99
django-extensions==2.1.6
10+
django-public-admin==0.0.1
1011
django-test-without-migrations==0.6
1112
djangorestframework==3.9.1
1213
freezegun==0.3.11

0 commit comments

Comments
 (0)