From e4cff40cc257c0135104d9970d5858be97f1cb55 Mon Sep 17 00:00:00 2001
From: Erin Mullaney <erin.mullaney@torchbox.com>
Date: Tue, 15 Jan 2019 11:43:09 -0500
Subject: [PATCH] #805 moving Screening Status from the Taxonomies to the Apply
admin
---
opentech/apply/funds/admin.py | 23 +++++++++++++++++++++++
opentech/public/utils/wagtail_hooks.py | 26 +-------------------------
2 files changed, 24 insertions(+), 25 deletions(-)
diff --git a/opentech/apply/funds/admin.py b/opentech/apply/funds/admin.py
index 559a76bf5..4da8e77f7 100644
--- a/opentech/apply/funds/admin.py
+++ b/opentech/apply/funds/admin.py
@@ -1,6 +1,7 @@
from wagtail.contrib.modeladmin.helpers import PermissionHelper
from wagtail.contrib.modeladmin.options import ModelAdmin, ModelAdminGroup
+from opentech.apply.funds.models import ScreeningStatus
from opentech.apply.review.admin import ReviewFormAdmin
from opentech.apply.utils.admin import ListRelatedMixin
from .admin_helpers import (
@@ -26,6 +27,27 @@ class RoundAdmin(BaseRoundAdmin):
model = Round
menu_icon = 'repeat'
+class ScreeningStatusPermissionHelper(PermissionHelper):
+ def user_can_edit_obj(self, user, obj):
+ """
+ Return a boolean to indicate whether `user` is permitted to 'change'
+ a specific `self.model` instance.
+ """
+ return user.is_superuser
+
+ def user_can_delete_obj(self, user, obj):
+ """
+ Return a boolean to indicate whether `user` is permitted to 'delete'
+ a specific `self.model` instance.
+ """
+ return user.is_superuser
+
+
+class ScreeningStatusAdmin(ModelAdmin):
+ model = ScreeningStatus
+ menu_icon = 'tag'
+ permission_helper_class = ScreeningStatusPermissionHelper
+
class SealedRoundAdmin(BaseRoundAdmin):
model = SealedRound
@@ -75,6 +97,7 @@ class ApplyAdminGroup(ModelAdminGroup):
menu_icon = 'folder-open-inverse'
items = (
RoundAdmin,
+ ScreeningStatusAdmin,
SealedRoundAdmin,
FundAdmin,
LabAdmin,
diff --git a/opentech/public/utils/wagtail_hooks.py b/opentech/public/utils/wagtail_hooks.py
index b0fac5230..4be37f0f7 100644
--- a/opentech/public/utils/wagtail_hooks.py
+++ b/opentech/public/utils/wagtail_hooks.py
@@ -1,7 +1,5 @@
-from wagtail.contrib.modeladmin.helpers import PermissionHelper
from wagtail.contrib.modeladmin.options import ModelAdminGroup, ModelAdmin, modeladmin_register
-from opentech.apply.funds.models import ScreeningStatus
from opentech.public.news.models import NewsType
from opentech.public.people.models import PersonType
@@ -16,31 +14,9 @@ class PersonTypeModelAdmin(ModelAdmin):
menu_icon = 'tag'
-class ScreeningStatusPermissionHelper(PermissionHelper):
- def user_can_edit_obj(self, user, obj):
- """
- Return a boolean to indicate whether `user` is permitted to 'change'
- a specific `self.model` instance.
- """
- return user.is_superuser
-
- def user_can_delete_obj(self, user, obj):
- """
- Return a boolean to indicate whether `user` is permitted to 'delete'
- a specific `self.model` instance.
- """
- return user.is_superuser
-
-
-class ScreeningStatusModelAdmin(ModelAdmin):
- model = ScreeningStatus
- menu_icon = 'tag'
- permission_helper_class = ScreeningStatusPermissionHelper
-
-
class TaxonomiesModelAdminGroup(ModelAdminGroup):
menu_label = "Taxonomies"
- items = (NewsTypeModelAdmin, PersonTypeModelAdmin, ScreeningStatusModelAdmin)
+ items = (NewsTypeModelAdmin, PersonTypeModelAdmin)
menu_icon = 'tag'
--
GitLab