[#116] Allow creating transitions without any approvals and introduce…

… TransitionMeta and Transition models

README.rst

@@ -87,8 +87,9 @@ Usage
 
 3. Create all your ``states`` on the admin page
 4. Create a ``workflow`` with your model ( ``MyModel`` - ``my_state_field`` ) information on the admin page
-5. Create your ``transition approval metadata`` within the workflow created earlier and authorization rules along with their priority on the admin page
-6. Enjoy your ``django-river`` journey.
+5. Create your ``transition metadata`` within the workflow created earlier, source and destination states
+6. Create your ``transition approval metadata`` within the workflow created earlier and authorization rules along with their priority on the admin page
+7. Enjoy your ``django-river`` journey.
 
     .. code-block:: python
 

docs/admin/index.rst

@@ -12,5 +12,6 @@ is to provide them by using their Django admin pages.
     :maxdepth: 2
 
     state
+    transition_meta
     transition_approval_meta
 

docs/admin/transition_approval_meta.rst

@@ -5,15 +5,14 @@ Transition Approval Meta Administration
 +---------------------------+------------+----------+--------------------+-------------------------------------------+
 |           Field           |  Default   | Optional |       Format       |                Description                |
 +===========================+============+==========+====================+===========================================+
-| workflow                  |            | False    | | Choice           | | Your model class along with the field   |
+| workflow                  |            |          | | Choice           | | Your model class along with the field   |
 |                           |            |          | | of               | | that you want to use this transition    |
 |                           |            | False    | | Strings          | | approval meta for. ``django-river``     |
 |                           |            |          |                    | | will list all the possible model and    |
 |                           |            |          |                    | | fields you can pick on the admin page   |
 +---------------------------+------------+----------+--------------------+-------------------------------------------+
-| source_state              |            | False    | State              | | Source state of the transition          |
-+---------------------------+------------+----------+--------------------+-------------------------------------------+
-| destination_state         |            | False    | State              | | Destination state of the transition     |
+| transition_meta           |            | False    | TransitionMete     | | Transition information that contains    |
+|                           |            |          |                    | | source and destination states           |
 +---------------------------+------------+----------+--------------------+-------------------------------------------+
 | permissions               | Empty List | True     | List<Permission>   | | List of permissions which will be       |
 |                           |            |          |                    | | authorized to approve this              |
@@ -43,7 +42,4 @@ Transition Approval Meta Administration
 
 .. toctree::
     :maxdepth: 2
-
-    basic
-    advance
 

docs/admin/transition_meta.rst

@@ -0,0 +1,21 @@
+.. _transition-meta-administration:
+
+Transition Meta Administration
+==============================
++---------------------------+------------+----------+--------------------+-------------------------------------------+
+|           Field           |  Default   | Optional |       Format       |                Description                |
++===========================+============+==========+====================+===========================================+
+| workflow                  |            | False    | | Choice           | | Your model class along with the field   |
+|                           |            |          | | of               | | that you want to use this transition    |
+|                           |            | False    | | Strings          | | approval meta for. ``django-river``     |
+|                           |            |          |                    | | will list all the possible model and    |
+|                           |            |          |                    | | fields you can pick on the admin page   |
++---------------------------+------------+----------+--------------------+-------------------------------------------+
+| source_state              |            | False    | State              | | Source state of the transition          |
++---------------------------+------------+----------+--------------------+-------------------------------------------+
+| destination_state         |            | False    | State              | | Destination state of the transition     |
++---------------------------+------------+----------+--------------------+-------------------------------------------+
+
+
+.. toctree::
+    :maxdepth: 2

docs/changelog.rst

@@ -16,6 +16,7 @@ Change Logs
     * **Improvement** -  # 113_: Support defining an approval hook with a specific approval.
     * **Improvement** -  # 114_: Support defining a transition hook with a specific iteration.
     * **Drop** -         # 115_: Drop skipping and disabling approvals to cut the unnecessary complexity.
+    * **Improvement** -  # 116_: Allow creating transitions without any approvals. A new TransitionMeta and Transition models are introduced to keep transition information even though there is no transition approval yet.
 
 
 .. _105: https://github.com/javrasya/django-river/issues/105
@@ -29,6 +30,7 @@ Change Logs
 .. _113: https://github.com/javrasya/django-river/issues/113
 .. _114: https://github.com/javrasya/django-river/issues/114
 .. _115: https://github.com/javrasya/django-river/issues/115
+.. _116: https://github.com/javrasya/django-river/issues/116
 
 2.0.0 (Stable)
 --------------

docs/getting_started.rst

@@ -29,8 +29,9 @@ Getting Started
 
 3. Create all your ``states`` on the admin page
 4. Create a ``workflow`` with your model ( ``MyModel`` - ``my_state_field`` ) information on the admin page
-5. Create your ``transition approval metadata`` within the workflow created earlier and authorization rules along with their priority on the admin page
-6. Enjoy your ``django-river`` journey.
+5. Create your ``transition metadata`` within the workflow created earlier, source and destination states
+6. Create your ``transition approval metadata`` within the workflow created earlier and authorization rules along with their priority on the admin page
+7. Enjoy your ``django-river`` journey.
 
     .. code-block:: python
 

river/admin/__init__.py

@@ -1,6 +1,7 @@
 from django.contrib import admin
 
 from river.admin.function_admin import *
+from river.admin.transitionmeta import *
 from river.admin.transitionapprovalmeta import *
 from river.admin.workflow import *
 from river.admin.hook_admins import *

river/admin/hook_admins.py

@@ -46,7 +46,7 @@ class OnApprovedHookAdmin(admin.ModelAdmin):
 
 
 class OnTransitHookAdmin(admin.ModelAdmin):
-    list_display = ('workflow', 'callback_function', 'source_state', 'destination_state')
+    list_display = ('workflow', 'callback_function', 'transition_meta')
 
 
 class OnCompleteHookAdmin(admin.ModelAdmin):

river/admin/transitionapprovalmeta.py

@@ -7,12 +7,12 @@
 class TransitionApprovalMetaForm(forms.ModelForm):
     class Meta:
         model = TransitionApprovalMeta
-        fields = ('workflow', 'source_state', 'destination_state', 'permissions', 'groups', 'priority')
+        fields = ('workflow', 'transition_meta', 'permissions', 'groups', 'priority')
 
 
 class TransitionApprovalMetaAdmin(admin.ModelAdmin):
     form = TransitionApprovalMetaForm
-    list_display = ('workflow', 'source_state', 'destination_state', 'priority')
+    list_display = ('workflow', 'transition_meta', 'priority')
 
 
 admin.site.register(TransitionApprovalMeta, TransitionApprovalMetaAdmin)

river/admin/transitionmeta.py

@@ -0,0 +1,19 @@
+from django.contrib import admin
+from django import forms
+
+from river.models import TransitionMeta
+from river.models.transitionapprovalmeta import TransitionApprovalMeta
+
+
+class TransitionMetaForm(forms.ModelForm):
+    class Meta:
+        model = TransitionMeta
+        fields = ('workflow', 'source_state', 'destination_state')
+
+
+class TransitionMetaAdmin(admin.ModelAdmin):
+    form = TransitionMetaForm
+    list_display = ('workflow', 'source_state', 'destination_state')
+
+
+admin.site.register(TransitionMeta, TransitionMetaAdmin)

river/core/classworkflowobject.py

@@ -30,7 +30,7 @@ def get_available_approvals(self, as_user):
             TransitionApproval.objects.filter(
                 workflow=self.workflow, status=PENDING
             ).values(
-                'workflow', 'object_id', 'source_state', 'destination_state'
+                'workflow', 'object_id', 'transition'
             ).annotate(min_priority=Min('priority'))
         )
 
@@ -43,8 +43,7 @@ def get_available_approvals(self, as_user):
             self._authorized_approvals(as_user),
             workflow_id=those_with_max_priority.col.workflow_id,
             object_id=those_with_max_priority.col.object_id,
-            source_state_id=those_with_max_priority.col.source_state_id,
-            destination_state_id=those_with_max_priority.col.destination_state_id,
+            transition_id=those_with_max_priority.col.transition_id,
         ).with_cte(
             those_with_max_priority
         ).annotate(
@@ -56,7 +55,7 @@ def get_available_approvals(self, as_user):
             approvals_with_max_priority, object_id_as_int=workflow_objects.col.pk
         ).with_cte(
             workflow_objects
-        ).filter(source_state=getattr(workflow_objects.col, self.field_name + "_id"))
+        ).filter(transition__source_state=getattr(workflow_objects.col, self.field_name + "_id"))
 
     @property
     def initial_state(self):
@@ -66,7 +65,7 @@ def initial_state(self):
     @property
     def final_states(self):
         final_approvals = TransitionApprovalMeta.objects.filter(workflow=self.workflow, children__isnull=True)
-        return State.objects.filter(pk__in=final_approvals.values_list("destination_state", flat=True))
+        return State.objects.filter(pk__in=final_approvals.values_list("transition_meta__destination_state", flat=True))
 
     def _authorized_approvals(self, as_user):
         group_q = Q()