From aff95c6388df1a9e52d626d2b7e1cf8a0fa1cb14 Mon Sep 17 00:00:00 2001
From: Maxime Bellec <maxime@telescoop.fr>
Date: Mon, 24 Jun 2024 16:57:51 +0200
Subject: [PATCH] chore: add support to wagtail6.0 using wagtail_modeladmin

---
 README.rst                  |  6 ++++--
 conf/django.py              |  2 +-
 requirements.txt            |  1 +
 wagtailsvg/wagtail_hooks.py | 14 ++++++++++----
 4 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/README.rst b/README.rst
index a2aa090..d5f6b55 100644
--- a/README.rst
+++ b/README.rst
@@ -50,13 +50,15 @@ Install with pip :
 
 ``pip install wagtailsvg``
 
-Add these to django apps installed :
+Add these to django apps installed. Only add the modeladmin line
+corresponding the the wagtail version you are using.
 
 .. code-block:: python
 
     INSTALLED_APPS = [
         'wagtailsvg',
-        'wagtail.contrib.modeladmin',
+        'wagtail.contrib.modeladmin', # only for wagtail <5.2
+        'wagtail_modeladmin',  # only for wagtail >=5.2
         'generic_chooser',
         ...
     ]
diff --git a/conf/django.py b/conf/django.py
index 6114f99..d6f6b43 100644
--- a/conf/django.py
+++ b/conf/django.py
@@ -33,7 +33,7 @@
     'wagtail',
     'wagtail.contrib.settings',
     'wagtail.contrib.frontend_cache',
-    'wagtail.contrib.modeladmin',
+    'wagtail_modeladmin',
     'taggit',
     'generic_chooser',
 
diff --git a/requirements.txt b/requirements.txt
index 2163aa1..0489fb8 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -2,3 +2,4 @@ Django>=4.1.7
 wagtail>=4.1
 flake8>=3.8.4
 wagtail-generic-chooser==0.5.1
+wagtail-modeladmin==2.0.0
diff --git a/wagtailsvg/wagtail_hooks.py b/wagtailsvg/wagtail_hooks.py
index ee2fe3b..199edbd 100644
--- a/wagtailsvg/wagtail_hooks.py
+++ b/wagtailsvg/wagtail_hooks.py
@@ -1,7 +1,13 @@
-from wagtail.contrib.modeladmin.options import (
-    ModelAdmin,
-    modeladmin_register
-)
+try:
+    from wagtail.contrib.modeladmin.options import (
+        ModelAdmin,
+        modeladmin_register
+    )
+except ImportError:
+    from wagtail_modeladmin.options import (
+        ModelAdmin,
+        modeladmin_register
+    )
 
 try:
     from wagtail import hooks