StateField with abstract models

django_states/fields.py

@@ -46,6 +46,9 @@ def contribute_to_class(self, cls, name):
         """
         super(StateField, self).contribute_to_class(cls, name)
 
+        if cls._meta.abstract:
+            # Do not contribute to abstract models
+            return
         # Set choice options (for combo box)
         self._choices = self._machine.get_state_choices()
         self.default = self._machine.initial_state
@@ -80,6 +83,7 @@ def contribute_to_class(self, cls, name):
 
         models.signals.class_prepared.connect(self.finalize, sender=cls)
 
+
     def finalize(self, sender, **kwargs):
         """
         Override ``save``, call initial state handler on save.

django_states/model_methods.py

@@ -84,6 +84,14 @@ def name(si_self):
             """
             return getattr(self, field)
 
+        @property
+        def initial(si_self):
+            """
+            The description of the current state
+            """
+            si = machine.get_state(getattr(self, field))
+            return si.initial
+
         @property
         def description(si_self):
             """
@@ -146,7 +154,7 @@ def test_transition(si_self, transition, user=None):
             if validation_errors:
                 raise TransitionNotValidated(si_self, transition, validation_errors)
 
-            return True
+            return si_self
 
         def make_transition(si_self, transition, user=None, **kwargs):
             """
@@ -194,19 +202,23 @@ def make_transition(si_self, transition, user=None, **kwargs):
             try:
                 from_state = getattr(self, field)
 
-                before_state_execute.send(sender=self,
+                before_state_execute.send(sender=self.__class__,
+                                          instance=self, 
                                           from_state=from_state,
-                                          to_state=t.to_state)
+                                          to_state=t.to_state,
+                                          user=user)
                 # First call handler (handler should still see the original
                 # state.)
                 t.handler(self, user, **kwargs)
 
                 # Then set new state and save.
                 setattr(self, field, t.to_state)
                 self.save()
-                after_state_execute.send(sender=self,
+                after_state_execute.send(sender=self.__class__,
+                                         instance=self, 
                                          from_state=from_state,
-                                         to_state=t.to_state)
+                                         to_state=t.to_state,
+                                         user=user)
             except Exception, e:
                 if _state_log_model:
                     transition_log.make_transition('fail')

django_states/signals.py

@@ -5,7 +5,9 @@
 
 #: Signal that is sent before a state transition is executed
 before_state_execute = django.dispatch.Signal(providing_args=['from_state',
-                                                              'to_state'])
+                                                              'to_state',
+                                                              'user'])
 #: Signal that s sent after a state transition is executed
 after_state_execute = django.dispatch.Signal(providing_args=['from_state',
-                                                             'to_state'])
+                                                             'to_state',
+                                                             'user'])

test_proj/settings.py

@@ -1,3 +1,4 @@
+import os
 # Django settings for test_proj project.
 import os, sys
 
@@ -157,4 +158,4 @@
             'propagate': True,
         },
     }
-}
+}