wip

Author: pfouque

django_fsm/admin.py

@@ -95,18 +95,32 @@ def get_fsm_object_transitions(self, request: HttpRequest, obj: typing.Any) -> l
 
         for field_name in sorted(self.fsm_fields):
             if func := getattr(obj, f"get_available_user_{field_name}_transitions"):
-                fsm_object_transitions.append(  # noqa: PERF401
-                    FSMObjectTransition(
-                        fsm_field=field_name,
-                        block_label=self.get_fsm_block_label(fsm_field_name=field_name),
-                        available_transitions=[
-                            t for t in func(user=request.user) if t.custom.get("admin", self.default_disallow_transition)
-                        ],
-                    )
+                yield FSMObjectTransition(
+                    fsm_field=field_name,
+                    block_label=self.get_fsm_block_label(fsm_field_name=field_name),
+                    available_transitions=[
+                        t for t in func(user=request.user) if t.custom.get("admin", self.default_disallow_transition)
+                    ],
                 )
 
-        return fsm_object_transitions
-
+    def get_fsm_transition_by_name(obj: typing.ANY, transition_name: str) -> fsm.Transition | None:
+        
+        try:
+            transition_name = request.POST[self.fsm_post_param]
+            transition_func = getattr(obj, transition_name)
+        except AttributeError:
+            self.message_user(
+                request=request,
+                message=self.fsm_transition_not_valid_msg.format(
+                    transition_name=transition_name,
+                ),
+                level=messages.ERROR,
+            )
+            return self.get_fsm_response(
+                request=request,
+                obj=obj,
+            )
+            
     def get_fsm_transition_form(self, transition: fsm.Transition) -> Form | None:
         form = transition.custom.get("form")
         if isinstance(form, str):
@@ -166,9 +180,15 @@ def response_change(self, request: HttpRequest, obj: typing.Any) -> HttpResponse
                 )
 
             # NOTE: if a form is defined on the transition, we redirect to the form view
-            if transition_func._django_fsm.get_transition(
-                source=transition_func._django_fsm.field.get_state(obj),
-            ).custom.get("form"):
+            if self.get_fsm_transition_form(
+                transition=transition_func._django_fsm.get_transition(
+                    source=transition_func._django_fsm.field.get_state(obj),
+            )):
+                print('✅' * 40)
+                print(transition_func._django_fsm.get_transition(
+                    source=transition_func._django_fsm.field.get_state(obj),
+                ).custom.get("form"))
+
                 return redirect(
                     reverse(
                         f"admin:{self.model._meta.app_label}_{self.model._meta.model_name}_transition",
@@ -209,6 +229,7 @@ def response_change(self, request: HttpRequest, obj: typing.Any) -> HttpResponse
                     level=messages.ERROR,
                 )
             else:
+                
                 obj.save()
                 self.message_user(
                     request=request,
@@ -279,14 +300,14 @@ def fsm_transition_view(self, request, *args, **kwargs):
             except fsm.TransitionNotAllowed:
                 self.message_user(
                     request,
-                    _("Transition %(transition)s is not allowed") % {"transition": self._get_transition_title(transition)},
+                    fsm_transition_not_allowed_msg.format(transition_name=transition_name),
                     messages.ERROR,
                 )
             else:
                 obj.save()
                 self.message_user(
                     request,
-                    _("Transition %(transition)s applied") % {"transition": self._get_transition_title(transition)},
+                    fsm_transition_success_msg.format(transition_name=transition_name),
                     messages.SUCCESS,
                 )
         return redirect(f"admin:{self.model._meta.app_label}_{self.model._meta.model_name}_change", object_id=obj.id)

tests/testapp/models.py

@@ -299,7 +299,7 @@ def secret_transition(self, by=None, description=None):
     @fsm_log_description
     @transition(
         field=state,
-        source=[AdminBlogPostState.CREATED],
+        source=AdminBlogPostState.CREATED,
         target=AdminBlogPostState.REVIEWED,
     )
     def moderate(self, by=None, description=None):

tests/testapp/tests/test_admin.py

@@ -51,6 +51,7 @@ def test_get_fsm_object_transitions(self):
         assert state_transition.fsm_field == "state"
         assert state_transition.block_label == "Transition (state)"
         assert sorted([t.name for t in state_transition.available_transitions]) == [
+            "complex_transition",
             "hide",
             "publish",
         ]