diff --git a/altmetric/wagtail_hooks.py b/altmetric/wagtail_hooks.py index f7db593a2..fac524458 100644 --- a/altmetric/wagtail_hooks.py +++ b/altmetric/wagtail_hooks.py @@ -1,23 +1,18 @@ from django.utils.translation import gettext_lazy as _ -from wagtail_modeladmin.options import ( - ModelAdmin, - ModelAdminGroup, - modeladmin_register, -) +from wagtail.snippets.models import register_snippet +from wagtail.snippets.views.snippets import SnippetViewSet from config.menu import get_menu_order from .models import RawAltmetric -class RawAltmetricAdmin(ModelAdmin): +@register_snippet +class RawAltmetricAdmin(SnippetViewSet): model = RawAltmetric menu_label = _("Altmetric") # ditch this to use verbose_name_plural from model menu_icon = "folder-open-inverse" # change as required menu_order = get_menu_order("altmetric") # will put in 3rd place (000 being 1st, 100 2nd) add_to_settings_menu = False # or True to add your model to the Settings sub-menu - exclude_from_explorer = ( - False # or True to exclude pages of this type from Wagtail's explorer view - ) list_display = ( "issn_scielo", @@ -27,6 +22,3 @@ class RawAltmetricAdmin(ModelAdmin): ) search_fields = ("issn_scielo",) - - -# modeladmin_register(RawAltmetricAdmin) diff --git a/book/wagtail_hooks.py b/book/wagtail_hooks.py index 4498957d6..b5bc61179 100644 --- a/book/wagtail_hooks.py +++ b/book/wagtail_hooks.py @@ -1,11 +1,7 @@ from django.http import HttpResponseRedirect from django.utils.translation import gettext_lazy as _ -from wagtail_modeladmin.options import ( - ModelAdmin, - ModelAdminGroup, - modeladmin_register, -) -from wagtail_modeladmin.views import CreateView +from wagtail.snippets.models import register_snippet +from wagtail.snippets.views.snippets import CreateView, SnippetViewSet, SnippetViewSetGroup from book.models import Book from config.menu import get_menu_order @@ -17,16 +13,13 @@ def form_valid(self, form): return HttpResponseRedirect(self.get_success_url()) -class BookAdmin(ModelAdmin): +class BookAdmin(SnippetViewSet): model = Book - create_view_class = BookCreateView + add_view_class = BookCreateView menu_label = _("Books") menu_icon = "folder" menu_order = 900 - add_to_settings_menu = False # or True to add your model to the Settings sub-menu - exclude_from_explorer = ( - False # or True to exclude pages of this type from Wagtail's explorer view - ) + add_to_settings_menu = False list_display = ( "title", @@ -42,11 +35,11 @@ class BookAdmin(ModelAdmin): search_fields = ("doi", "title", "isbn", "eisbn", "synopsis") -class BookAdminGroup(ModelAdminGroup): +class BookAdminGroup(SnippetViewSetGroup): menu_label = _("Books") - menu_icon = "folder-open-inverse" # change as required - menu_order = get_menu_order("book") # will put in 3rd place (000 being 1st, 100 2nd) + menu_icon = "folder-open-inverse" + menu_order = get_menu_order("book") items = (BookAdmin,) -modeladmin_register(BookAdminGroup) +register_snippet(BookAdminGroup) diff --git a/collection/wagtail_hooks.py b/collection/wagtail_hooks.py index 81d6a6ef3..37a6e71b4 100644 --- a/collection/wagtail_hooks.py +++ b/collection/wagtail_hooks.py @@ -1,7 +1,7 @@ from django.http import HttpResponseRedirect from django.utils.translation import gettext_lazy as _ -from wagtail_modeladmin.options import ModelAdmin, modeladmin_register -from wagtail_modeladmin.views import CreateView +from wagtail.snippets.models import register_snippet +from wagtail.snippets.views.snippets import CreateView, SnippetViewSet from .models import Collection from config.menu import get_menu_order @@ -13,17 +13,15 @@ def form_valid(self, form): return HttpResponseRedirect(self.get_success_url()) -class CollectionAdmin(ModelAdmin): +@register_snippet +class CollectionAdmin(SnippetViewSet): model = Collection - create_view_class = CollectionCreateView + add_view_class = CollectionCreateView inspect_view_enabled = True menu_label = _("Collection") menu_icon = "folder-open-inverse" menu_order = get_menu_order("collection") - add_to_settings_menu = False # or True to add your model to the Settings sub-menu - exclude_from_explorer = ( - False # or True to exclude pages of this type from Wagtail's explorer view - ) + add_to_settings_menu = False list_display = ( "main_name", "acron3", @@ -64,11 +62,3 @@ class CollectionAdmin(ModelAdmin): "updated_by", ) export_filename = "collections" - inspect_view_fields_exclude = { - "id", - "creator", - "updated_by" - } - - -modeladmin_register(CollectionAdmin) diff --git a/core/wagtail_hooks.py b/core/wagtail_hooks.py index 2218a6c39..c24ebe82d 100755 --- a/core/wagtail_hooks.py +++ b/core/wagtail_hooks.py @@ -12,7 +12,6 @@ SnippetViewSet, SnippetViewSetGroup, ) -from wagtail_modeladmin.options import ModelAdmin, ModelAdminGroup, modeladmin_register from article.models import Article from collection.models import Collection @@ -106,12 +105,11 @@ def add_items_summary_items(request, items): items.append(ArticleSummaryItem(request)) -class GenderAdmin(ModelAdmin): +class GenderAdmin(SnippetViewSet): model = Gender menu_icon = "folder" menu_order = 600 add_to_settings_menu = False - exclude_from_explorer = False list_display = ( "code", "gender", @@ -123,7 +121,7 @@ class GenderAdmin(ModelAdmin): ) -class ListCodesAdminGroup(ModelAdminGroup): +class ListCodesAdminGroup(SnippetViewSetGroup): menu_label = "List of codes" menu_icon = "folder-open-inverse" menu_order = get_menu_order("core") @@ -144,7 +142,7 @@ class ListCodesAdminGroup(ModelAdminGroup): ) -modeladmin_register(ListCodesAdminGroup) +register_snippet(ListCodesAdminGroup) @hooks.register("construct_main_menu") diff --git a/editorialboard/wagtail_hooks.py b/editorialboard/wagtail_hooks.py index 731b2faac..00dab2c94 100644 --- a/editorialboard/wagtail_hooks.py +++ b/editorialboard/wagtail_hooks.py @@ -2,8 +2,7 @@ from django.utils.translation import gettext_lazy as _ from wagtail.admin.panels import FieldPanel, InlinePanel from wagtail.snippets.models import register_snippet -from wagtail.snippets.views.snippets import SnippetViewSet, SnippetViewSetGroup -from wagtail_modeladmin.views import CreateView +from wagtail.snippets.views.snippets import CreateView, SnippetViewSet, SnippetViewSetGroup from wagtailautocomplete.edit_handlers import AutocompletePanel from config.menu import get_menu_order @@ -19,11 +18,11 @@ def form_valid(self, form): class EditorialBoardMemberAdmin(SnippetViewSet): model = EditorialBoardMember + add_view_class = EditorialBoardMemberCreateView menu_label = _("Editorial Board Member") menu_icon = "folder" menu_order = 200 add_to_settings_menu = False - exclude_from_explorer = False list_display = ( "journal", "researcher", @@ -45,7 +44,6 @@ class RoleModelAdmin(SnippetViewSet): menu_icon = "folder" menu_order = 9 add_to_settings_menu = False - exclude_from_explorer = False list_display = ("declared_role", "std_role", "updated", "created") list_filter = ("std_role",) search_fields = ("declared_role",) diff --git a/files_storage/wagtail_hooks.py b/files_storage/wagtail_hooks.py index 988d802e6..fc964cacc 100644 --- a/files_storage/wagtail_hooks.py +++ b/files_storage/wagtail_hooks.py @@ -1,7 +1,7 @@ from django.http import HttpResponseRedirect from django.utils.translation import gettext_lazy as _ -from wagtail_modeladmin.options import ModelAdmin, modeladmin_register -from wagtail_modeladmin.views import CreateView +from wagtail.snippets.models import register_snippet +from wagtail.snippets.views.snippets import CreateView, SnippetViewSet from config.menu import get_menu_order from files_storage.models import MinioConfiguration @@ -13,15 +13,15 @@ def form_valid(self, form): return HttpResponseRedirect(self.get_success_url()) -class MinioConfigurationAdmin(ModelAdmin): +@register_snippet +class MinioConfigurationAdmin(SnippetViewSet): model = MinioConfiguration menu_label = _("Minio Configuration") - create_view_class = MinioConfigurationCreateView + add_view_class = MinioConfigurationCreateView menu_icon = "folder" menu_order = get_menu_order("files_storage") # no menu, ficará disponível como sub-menu em "Settings" add_to_settings_menu = True - exclude_from_explorer = False inspect_view_enabled = True list_per_page = 10 @@ -37,6 +37,3 @@ class MinioConfigurationAdmin(ModelAdmin): "bucket_root", "bucket_app_subdir", ) - - -modeladmin_register(MinioConfigurationAdmin) diff --git a/journal/wagtail_hooks.py b/journal/wagtail_hooks.py index df99c9eba..daacb2a59 100755 --- a/journal/wagtail_hooks.py +++ b/journal/wagtail_hooks.py @@ -13,7 +13,6 @@ SnippetViewSet, SnippetViewSetGroup, ) -from wagtail_modeladmin.options import ModelAdmin from config.menu import get_menu_order from journalpage.models import JournalPage @@ -456,13 +455,12 @@ class JournalSnippetViewSetGroup(SnippetViewSetGroup): register_snippet(JournalSnippetViewSetGroup) -class IndexedAtAdmin(ModelAdmin): +class IndexedAtAdmin(SnippetViewSet): model = models.IndexedAt menu_label = "Indexed At" menu_icon = "folder" menu_order = 100 add_to_settings_menu = False - exclude_from_explorer = False list_display = ("name", "acronym", "url", "description", "type") list_filter = ("type",) search_fields = ("name", "acronym") @@ -470,36 +468,33 @@ class IndexedAtAdmin(ModelAdmin): export_filename = "indexed_at" -class AdditionalIndexedAtAdmin(ModelAdmin): +class AdditionalIndexedAtAdmin(SnippetViewSet): model = models.AdditionalIndexedAt menu_label = "Additional Indexed At" menu_icon = "folder" menu_order = 110 add_to_settings_menu = False - exclude_from_explorer = False list_display = ("name",) search_fields = ("name",) -class IndexedAtFileAdmin(ModelAdmin): +class IndexedAtFileAdmin(SnippetViewSet): model = models.IndexedAtFile button_helper_class = IndexedAtHelper menu_label = "Indexed At Upload" menu_icon = "folder" menu_order = 200 add_to_settings_menu = False - exclude_from_explorer = False list_display = ("attachment", "line_count", "is_valid") list_filter = ("is_valid",) search_fields = ("attachment",) -class WebOfKnowledgeAdmin(ModelAdmin): +class WebOfKnowledgeAdmin(SnippetViewSet): model = models.WebOfKnowledge menu_icon = "folder" menu_order = 100 add_to_settings_menu = False - exclude_from_explorer = False list_display = ( "code", "value", @@ -511,12 +506,11 @@ class WebOfKnowledgeAdmin(ModelAdmin): ) -class SubjectAdmin(ModelAdmin): +class SubjectAdmin(SnippetViewSet): model = models.Subject menu_icon = "folder" menu_order = 300 add_to_settings_menu = False - exclude_from_explorer = False list_display = ( "code", "value", @@ -528,22 +522,20 @@ class SubjectAdmin(ModelAdmin): ) -class WosAreaAdmin(ModelAdmin): +class WosAreaAdmin(SnippetViewSet): model = models.WebOfKnowledgeSubjectCategory menu_icon = "folder" menu_order = 400 add_to_settings_menu = False - exclude_from_explorer = False list_display = ("value",) search_fields = ("value",) -class StandardAdmin(ModelAdmin): +class StandardAdmin(SnippetViewSet): model = models.Standard menu_icon = "folder" menu_order = 500 add_to_settings_menu = False - exclude_from_explorer = False list_display = ( "code", "value", @@ -555,7 +547,7 @@ class StandardAdmin(ModelAdmin): ) -class ArticleSubmissionFormatCheckListAdmin(ModelAdmin): +class ArticleSubmissionFormatCheckListAdmin(SnippetViewSet): model = models.ArticleSubmissionFormatCheckList menu_label = _("Article Submission Format Check List") menu_icon = "folder" diff --git a/location/wagtail_hooks.py b/location/wagtail_hooks.py index 47e076418..b6dc5bbb0 100755 --- a/location/wagtail_hooks.py +++ b/location/wagtail_hooks.py @@ -2,12 +2,8 @@ from django.urls import include, path from django.utils.translation import gettext_lazy as _ from wagtail import hooks -from wagtail_modeladmin.options import ( - ModelAdmin, - ModelAdminGroup, - modeladmin_register, -) -from wagtail_modeladmin.views import CreateView +from wagtail.snippets.models import register_snippet +from wagtail.snippets.views.snippets import CreateView, SnippetViewSet, SnippetViewSetGroup from .button_helpers import CountryHelper from .models import City, Country, CountryFile, Location, State @@ -21,16 +17,13 @@ def form_valid(self, form): return HttpResponseRedirect(self.get_success_url()) -class LocationAdmin(ModelAdmin): +class LocationAdmin(SnippetViewSet): model = Location - create_view_class = LocationCreateView + add_view_class = LocationCreateView menu_label = _("Location") menu_icon = "folder" menu_order = 700 - add_to_settings_menu = False # or True to add your model to the Settings sub-menu - exclude_from_explorer = ( - False # or True to exclude pages of this type from Wagtail's explorer view - ) + add_to_settings_menu = False list_display = ( "country", "state", @@ -52,28 +45,26 @@ class LocationAdmin(ModelAdmin): export_filename = "locations" -class CityAdmin(ModelAdmin): +class CityAdmin(SnippetViewSet): model = City - create_view_class = LocationCreateView + add_view_class = LocationCreateView menu_label = _("City") menu_icon = "folder" menu_order = 700 add_to_settings_menu = False - exclude_from_explorer = False list_display = ("name",) search_fields = ("name",) list_export = ("name",) export_filename = "cities" -class StateAdmin(ModelAdmin): +class StateAdmin(SnippetViewSet): model = State - create_view_class = LocationCreateView + add_view_class = LocationCreateView menu_label = _("State") menu_icon = "folder" menu_order = 700 add_to_settings_menu = False - exclude_from_explorer = False list_display = ( "name", "acronym", @@ -89,14 +80,13 @@ class StateAdmin(ModelAdmin): export_filename = "states" -class CountryAdmin(ModelAdmin): +class CountryAdmin(SnippetViewSet): model = Country - create_view_class = LocationCreateView + add_view_class = LocationCreateView menu_label = _("Country") menu_icon = "folder" menu_order = 700 add_to_settings_menu = False - exclude_from_explorer = False list_display = ( "name", "acronym", @@ -115,21 +105,19 @@ class CountryAdmin(ModelAdmin): export_filename = "countries" -class CountryFileAdmin(ModelAdmin): +class CountryFileAdmin(SnippetViewSet): model = CountryFile button_helper_class = CountryHelper menu_label = "Country Upload" menu_icon = "folder" menu_order = 200 add_to_settings_menu = False - exclude_from_explorer = False list_display = ("attachment", "line_count", "is_valid") list_filter = ("is_valid",) search_fields = ("attachment",) -# modeladmin_register(LocationAdmin) -class LocationAdminGroup(ModelAdminGroup): +class LocationAdminGroup(SnippetViewSetGroup): menu_label = _("Location") menu_icon = "folder-open-inverse" menu_order = get_menu_order("location") @@ -142,7 +130,7 @@ class LocationAdminGroup(ModelAdminGroup): ) -modeladmin_register(LocationAdminGroup) +register_snippet(LocationAdminGroup) @hooks.register("register_admin_urls") diff --git a/report/wagtail_hooks.py b/report/wagtail_hooks.py index 7ddcab688..f0f371b3d 100644 --- a/report/wagtail_hooks.py +++ b/report/wagtail_hooks.py @@ -1,19 +1,17 @@ -from wagtail_modeladmin.options import ( - ModelAdmin, - modeladmin_register, -) +from wagtail.snippets.models import register_snippet +from wagtail.snippets.views.snippets import SnippetViewSet from django.utils.translation import gettext_lazy as _ from .models import ReportCSV from config.menu import get_menu_order -class ReportCSVAdmin(ModelAdmin): +@register_snippet +class ReportCSVAdmin(SnippetViewSet): model = ReportCSV menu_label = _("Report CSV") menu_icon = "folder" menu_order = get_menu_order("report") add_to_settings_menu = False - exclude_from_explorer = False list_display = ( "journal", "title", @@ -39,6 +37,4 @@ def link_download(self, obj): return None link_download.short_descriptions = 'Download' - link_download.allow_tags = True - -modeladmin_register(ReportCSVAdmin) \ No newline at end of file + link_download.allow_tags = True \ No newline at end of file diff --git a/researcher/wagtail_hooks.py b/researcher/wagtail_hooks.py index 3f04d5197..22f17debb 100644 --- a/researcher/wagtail_hooks.py +++ b/researcher/wagtail_hooks.py @@ -2,9 +2,7 @@ from django.utils.translation import gettext_lazy as _ from wagtail.snippets.models import register_snippet from wagtail.snippets.views.snippets import CreateView as CreateViewAdmin -from wagtail.snippets.views.snippets import EditView, SnippetViewSet -from wagtail_modeladmin.options import ModelAdmin, ModelAdminGroup -from wagtail_modeladmin.views import CreateView +from wagtail.snippets.views.snippets import EditView, SnippetViewSet, SnippetViewSetGroup from config.menu import get_menu_order @@ -17,20 +15,19 @@ ) -class ResearcherCreateView(CreateView): +class ResearcherCreateView(CreateViewAdmin): def form_valid(self, form): self.object = form.save_all(self.request.user) return HttpResponseRedirect(self.get_success_url()) -class ResearcherAdmin(ModelAdmin): +class ResearcherAdmin(SnippetViewSet): model = Researcher - create_view_class = ResearcherCreateView + add_view_class = ResearcherCreateView menu_label = _("Researcher") menu_icon = "folder" menu_order = 9 add_to_settings_menu = False - exclude_from_explorer = False list_display = ( "person_name", "affiliation", @@ -45,20 +42,19 @@ class ResearcherAdmin(ModelAdmin): ) -class ResearcherIdentifierCreateView(CreateView): +class ResearcherIdentifierCreateView(CreateViewAdmin): def form_valid(self, form): self.object = form.save_all(self.request.user) return HttpResponseRedirect(self.get_success_url()) -class ResearcherIdentifierAdmin(ModelAdmin): +class ResearcherIdentifierAdmin(SnippetViewSet): model = ResearcherIdentifier - create_view_class = ResearcherIdentifierCreateView + add_view_class = ResearcherIdentifierCreateView menu_label = _("Researcher Identifier") menu_icon = "folder" menu_order = 9 add_to_settings_menu = False - exclude_from_explorer = False list_display = ( "identifier", "source_name", @@ -69,13 +65,12 @@ class ResearcherIdentifierAdmin(ModelAdmin): search_fields = ("identifier",) -class AffiliationAdmin(ModelAdmin): +class AffiliationAdmin(SnippetViewSet): model = Affiliation menu_label = _("Affiliation") menu_icon = "folder" menu_order = 9 add_to_settings_menu = False - exclude_from_explorer = False list_display = ( # "institution", "created", @@ -83,20 +78,19 @@ class AffiliationAdmin(ModelAdmin): ) -class PersonNameCreateView(CreateView): +class PersonNameCreateView(CreateViewAdmin): def form_valid(self, form): self.object = form.save_all(self.request.user) return HttpResponseRedirect(self.get_success_url()) -class PersonNameAdmin(ModelAdmin): +class PersonNameAdmin(SnippetViewSet): model = PersonName - create_view_class = PersonNameCreateView + add_view_class = PersonNameCreateView menu_label = _("PersonName") menu_icon = "folder" menu_order = 9 add_to_settings_menu = False - exclude_from_explorer = False list_display = ( "declared_name", "fullname", @@ -108,9 +102,9 @@ class PersonNameAdmin(ModelAdmin): search_fields = ("fullname", "declared_name") -class ResearcherAdminGroup(ModelAdminGroup): +class ResearcherAdminGroup(SnippetViewSetGroup): menu_label = _("Researchers") - menu_icon = "folder-open-inverse" # change as required + menu_icon = "folder-open-inverse" menu_order = get_menu_order("researcher") items = ( ResearcherIdentifierAdmin, @@ -120,6 +114,9 @@ class ResearcherAdminGroup(ModelAdminGroup): ) +register_snippet(ResearcherAdminGroup) + + class ResearcherOrcidFormValidationMixin: def form_valid(self, form): form_kwargs = self.get_form_kwargs() diff --git a/thematic_areas/wagtail_hooks.py b/thematic_areas/wagtail_hooks.py index b92580c29..019612588 100644 --- a/thematic_areas/wagtail_hooks.py +++ b/thematic_areas/wagtail_hooks.py @@ -2,12 +2,8 @@ from django.urls import include, path from django.utils.translation import gettext_lazy as _ from wagtail import hooks -from wagtail_modeladmin.options import ( - ModelAdmin, - ModelAdminGroup, - modeladmin_register, -) -from wagtail_modeladmin.views import CreateView, EditView +from wagtail.snippets.models import register_snippet +from wagtail.snippets.views.snippets import CreateView, EditView, SnippetViewSet, SnippetViewSetGroup from config.menu import get_menu_order from .button_helpers import GenericThematicAreaHelper, ThematicAreaHelper @@ -37,16 +33,13 @@ def form_valid(self, form): return HttpResponseRedirect(self.get_success_url()) -class GenericThematicAreaAdmin(ModelAdmin): +class GenericThematicAreaAdmin(SnippetViewSet): model = GenericThematicArea - create_view_class = GenericThematicAreaCreateView + add_view_class = GenericThematicAreaCreateView menu_label = _("Generic Thematic Area") menu_icon = "folder" menu_order = 100 - add_to_settings_menu = False # or True to add your model to the Settings sub-menu - exclude_from_explorer = ( - False # or True to exclude pages of this type from Wagtail's explorer view - ) + add_to_settings_menu = False list_display = ( "text", "language", @@ -74,16 +67,15 @@ class GenericThematicAreaAdmin(ModelAdmin): export_filename = "generic_thematic_areas" -class GenericThematicAreaFileAdmin(ModelAdmin): +class GenericThematicAreaFileAdmin(SnippetViewSet): model = GenericThematicAreaFile ordering = ("-updated",) - create_view_class = GenericThematicAreaFileCreateView + add_view_class = GenericThematicAreaFileCreateView button_helper_class = GenericThematicAreaHelper menu_label = _("Generic Thematic Areas Upload") menu_icon = "folder" menu_order = 200 add_to_settings_menu = False - exclude_from_explorer = False list_display = ( "attachment", "line_count", @@ -96,7 +88,7 @@ class GenericThematicAreaFileAdmin(ModelAdmin): search_fields = ("attachment__title",) -class GenericThematicAreaAdminGroup(ModelAdminGroup): +class GenericThematicAreaAdminGroup(SnippetViewSetGroup): menu_label = _("Generic Thematic Areas") menu_icon = "folder-open-inverse" menu_order = 600 @@ -106,7 +98,7 @@ class GenericThematicAreaAdminGroup(ModelAdminGroup): ) -# modeladmin_register(GenericThematicAreaAdminGroup) +# register_snippet(GenericThematicAreaAdminGroup) @hooks.register("register_admin_urls") @@ -137,16 +129,13 @@ def form_valid(self, form): return HttpResponseRedirect(self.get_success_url()) -class ThematicAreaAdmin(ModelAdmin): +class ThematicAreaAdmin(SnippetViewSet): model = ThematicArea - create_view_class = ThematicAreaCreateView + add_view_class = ThematicAreaCreateView menu_label = _("Thematic Area") menu_icon = "folder" menu_order = 100 - add_to_settings_menu = False # or True to add your model to the Settings sub-menu - exclude_from_explorer = ( - False # or True to exclude pages of this type from Wagtail's explorer view - ) + add_to_settings_menu = False list_display = ( "level0", "level1", @@ -171,16 +160,15 @@ class ThematicAreaAdmin(ModelAdmin): export_filename = "thematic_areas" -class ThematicAreaFileAdmin(ModelAdmin): +class ThematicAreaFileAdmin(SnippetViewSet): model = ThematicAreaFile ordering = ("-updated",) - create_view_class = ThematicAreaFileCreateView + add_view_class = ThematicAreaFileCreateView button_helper_class = ThematicAreaHelper menu_label = _("Thematic Areas Upload") menu_icon = "folder" menu_order = 200 add_to_settings_menu = False - exclude_from_explorer = False list_display = ( "attachment", "line_count", @@ -193,7 +181,7 @@ class ThematicAreaFileAdmin(ModelAdmin): search_fields = ("attachment__title",) -class ThematicAreaAdminGroup(ModelAdminGroup): +class ThematicAreaAdminGroup(SnippetViewSetGroup): menu_label = _("Thematic Areas") menu_icon = "folder-open-inverse" menu_order = get_menu_order("thematic_areas") @@ -203,7 +191,7 @@ class ThematicAreaAdminGroup(ModelAdminGroup): ) -# modeladmin_register(ThematicAreaAdminGroup) +# register_snippet(ThematicAreaAdminGroup) @hooks.register("register_admin_urls") diff --git a/tracker/wagtail_hooks.py b/tracker/wagtail_hooks.py index 6ff37a5d8..eec299f4e 100644 --- a/tracker/wagtail_hooks.py +++ b/tracker/wagtail_hooks.py @@ -1,25 +1,20 @@ from django.http import HttpResponseRedirect from django.utils.translation import gettext_lazy as _ -from wagtail_modeladmin.options import ( - ModelAdmin, - ModelAdminGroup, - modeladmin_register, -) -from wagtail_modeladmin.views import CreateView +from wagtail.snippets.models import register_snippet +from wagtail.snippets.views.snippets import SnippetViewSet, SnippetViewSetGroup from config.menu import get_menu_order from .models import UnexpectedEvent, Hello -class UnexpectedEventModelAdmin(ModelAdmin): +class UnexpectedEventModelAdmin(SnippetViewSet): model = UnexpectedEvent inspect_view_enabled = True menu_label = _("Unexpected Events") menu_icon = "folder" menu_order = 200 add_to_settings_menu = False - exclude_from_explorer = False list_per_page = 10 list_display = ( @@ -47,14 +42,13 @@ class UnexpectedEventModelAdmin(ModelAdmin): ) -class HelloModelAdmin(ModelAdmin): +class HelloModelAdmin(SnippetViewSet): model = Hello inspect_view_enabled = True menu_label = _("Hello events") menu_icon = "folder" menu_order = 200 add_to_settings_menu = False - exclude_from_explorer = False list_per_page = 10 list_display = ( @@ -78,11 +72,11 @@ class HelloModelAdmin(ModelAdmin): ) -class UnexpectedEventModelAdminGroup(ModelAdminGroup): +class UnexpectedEventModelAdminGroup(SnippetViewSetGroup): menu_icon = "folder" menu_label = _("Unexpected errors") menu_order = get_menu_order("tracker") items = (UnexpectedEventModelAdmin, HelloModelAdmin) -modeladmin_register(UnexpectedEventModelAdminGroup) +register_snippet(UnexpectedEventModelAdminGroup) diff --git a/vocabulary/wagtail_hooks.py b/vocabulary/wagtail_hooks.py index 3528f5251..af6731807 100755 --- a/vocabulary/wagtail_hooks.py +++ b/vocabulary/wagtail_hooks.py @@ -1,11 +1,7 @@ from django.http import HttpResponseRedirect from django.utils.translation import gettext_lazy as _ -from wagtail_modeladmin.options import ( - ModelAdmin, - ModelAdminGroup, - modeladmin_register, -) -from wagtail_modeladmin.views import CreateView +from wagtail.snippets.models import register_snippet +from wagtail.snippets.views.snippets import CreateView, SnippetViewSet, SnippetViewSetGroup from config.menu import get_menu_order from .models import Keyword, Vocabulary @@ -17,15 +13,14 @@ def form_valid(self, form): return HttpResponseRedirect(self.get_success_url()) -class VocabularyAdmin(ModelAdmin): +class VocabularyAdmin(SnippetViewSet): model = Vocabulary inspect_view_enabled = True menu_label = _("Vocabulary") - create_view_class = VocabularyCreateView + add_view_class = VocabularyCreateView menu_icon = "folder" menu_order = 100 add_to_settings_menu = False - exclude_from_explorer = False list_display = ( "name", @@ -43,15 +38,14 @@ def form_valid(self, form): return HttpResponseRedirect(self.get_success_url()) -class KeywordAdmin(ModelAdmin): +class KeywordAdmin(SnippetViewSet): model = Keyword inspect_view_enabled = True menu_label = _("Keyword") - create_view_class = KeywordCreateView + add_view_class = KeywordCreateView menu_icon = "folder" menu_order = 200 add_to_settings_menu = False - exclude_from_explorer = False list_display = ( "text", @@ -65,11 +59,11 @@ class KeywordAdmin(ModelAdmin): ) -class VocabularyGroup(ModelAdminGroup): +class VocabularyGroup(SnippetViewSetGroup): menu_label = _("Vocabulary") - menu_icon = "folder-open-inverse" # change as required + menu_icon = "folder-open-inverse" menu_order = get_menu_order("vocabulary") items = (VocabularyAdmin, KeywordAdmin) -modeladmin_register(VocabularyGroup) +register_snippet(VocabularyGroup)