Make it compatible with fsm-log

Author: pfouque

django_fsm/admin.py

@@ -15,6 +15,13 @@
 
 import django_fsm as fsm
 
+try:
+    import django_fsm_log  # noqa: F401
+except ModuleNotFoundError:
+    FSM_LOG_ENABLED = False
+else:
+    FSM_LOG_ENABLED = True
+
 
 @dataclass
 class FSMObjectTransition:
@@ -127,7 +134,20 @@ def response_change(self, request: HttpRequest, obj: Any) -> HttpResponse:
                 )
 
             try:
-                transition_func()
+                if FSM_LOG_ENABLED:
+                    # Run the transition
+                    try:
+                        # Attempt to pass in the request and by argument if using django-fsm-log
+                        transition_func(request=request, by=request.user)
+                    except TypeError:
+                        try:
+                            # Attempt to pass in the by argument if using django-fsm-log
+                            transition_func(by=request.user)
+                        except TypeError:
+                            # If the function does not have a by attribute, just call with no arguments
+                            transition_func()
+                else:
+                    transition_func()
             except fsm.TransitionNotAllowed:
                 self.message_user(
                     request=request,

tests/testapp/tests/test_admin.py

@@ -139,6 +139,7 @@ def test_transition_applied(self, mock_message_user):
             path="/",
             data={"_fsm_transition_to": "moderate"},
         )
+        request.user = MockSuperUser()
 
         blog_post = AdminBlogPost.objects.create(title="Article name")
         assert blog_post.state == AdminBlogPostState.CREATED
@@ -162,6 +163,7 @@ def test_transition_not_allowed_exception(self, mock_message_user):
             path="/",
             data={"_fsm_transition_to": "publish"},
         )
+        request.user = MockSuperUser()
 
         blog_post = AdminBlogPost.objects.create(title="Article name")
         assert blog_post.state == AdminBlogPostState.CREATED
@@ -185,6 +187,7 @@ def test_concurrent_transition_exception(self, mock_message_user):
             path="/",
             data={"_fsm_transition_to": "moderate"},
         )
+        request.user = MockSuperUser()
 
         blog_post = AdminBlogPost.objects.create(title="Article name")
         assert blog_post.state == AdminBlogPostState.CREATED

tox.ini

@@ -13,6 +13,7 @@ deps =
     dj51: Django==5.1
     dj52: Django==5.2
 
+    django-fsm-log
     django-guardian
     graphviz
     pep8