Merge branch 'master' of ssh://200.50.168.30:222/VendorSoftwareFlowdat3/WorkflowBundle

Entity/Action.php

@@ -306,6 +306,7 @@ class Action
         
         return $twig->render($this->name, array(
             'entity' => $entity,
+            'object' => $entity,
             'params' => $this->twigParams,
         ));
     }

Utils/WorkFlowStates.php

@@ -0,0 +1,18 @@
+<?php
+
+namespace WorkflowBundle\Utils;
+
+class WorkFlowStates
+{
+
+    use ChoiceTrait;
+
+    const ACTIVE_STATE = 'active';
+
+    const PENDING_STATE = 'pending';
+        
+    const PRE_NOTICE_STATE = 'pre_notice';
+    
+    const SUSPEND_STATE = 'suspend';
+
+}