updated for django 3.x

Author: faxad

README.md

@@ -18,8 +18,8 @@ What is an ActivFlow workflow?
 ![alt tag](https://user-images.githubusercontent.com/6130967/28086399-5625a4e8-6698-11e7-8a00-ccf3180d70be.png)
 
 ### Technology Stack
-- Python 2.7x, 3.4x, 3.5x, 3.6x
-- Django 1.9x, 1.10x, 1.11x
+- Python 3.5+
+- Django 3.x
 - Bootstrap 3.x
 
 ### Usage & Configuration

activflow/core/models.py

@@ -6,7 +6,8 @@
     CharField,
     DateTimeField,
     OneToOneField,
-    ForeignKey)
+    ForeignKey,
+    CASCADE)
 
 from activflow.core.constants import (
     REQUEST_STATUS,
@@ -55,17 +56,17 @@ def __unicode__(self):
 
 class Request(AbstractEntity):
     """Defines the workflow request"""
-    requester = ForeignKey(User, related_name='requests')
+    requester = ForeignKey(User, related_name='requests', on_delete=CASCADE)
     module_ref = CharField(max_length=100)
     status = CharField(
         verbose_name="Status", max_length=30, choices=REQUEST_STATUS)
 
 
 class Task(AbstractEntity):
     """Defines the workflow task"""
-    request = ForeignKey(Request, related_name='tasks')
-    assignee = ForeignKey(Group)
-    updated_by = ForeignKey(User)
+    request = ForeignKey(Request, related_name='tasks', on_delete=CASCADE)
+    assignee = ForeignKey(Group, on_delete=CASCADE)
+    updated_by = ForeignKey(User, on_delete=CASCADE)
     activity_ref = CharField(max_length=100)
     status = CharField(
         verbose_name="Status", max_length=30, choices=TASK_STATUS)
@@ -167,7 +168,7 @@ def rollback(self):
 
 class AbstractActivity(AbstractEntity):
     """Common attributes for all activities"""
-    task = OneToOneField(Task, null=True)
+    task = OneToOneField(Task, null=True, on_delete=CASCADE)
 
     class Meta(object):
         abstract = True

activflow/core/templatetags/core_tags.py

@@ -24,7 +24,7 @@ def label_with_class(value, arg):
     return value.label_tag(attrs={'class': arg})
 
 
-@register.assignment_tag(takes_context=True)
+@register.simple_tag(takes_context=True)
 def activity_data(context, instance, option, _type):
     """Returns activity data as in field/value pair"""
     app = context['app_title']
@@ -95,7 +95,7 @@ def get_all_fields(instance, exclude=None):
         return related_model_fields
 
 
-@register.assignment_tag(takes_context=True)
+@register.simple_tag(takes_context=True)
 def wysiwyg_form_fields(context):
     """Returns activity data as in field/value pair"""
     app = context['app_title']

activflow/core/views.py

@@ -2,7 +2,7 @@
 
 from django.contrib.auth.decorators import login_required
 from django.contrib.auth.mixins import LoginRequiredMixin
-from django.core.urlresolvers import reverse, reverse_lazy
+from django.urls import reverse, reverse_lazy
 from django.db import transaction
 from django.http import HttpResponseRedirect
 from django.shortcuts import render

activflow/settings/base.py

@@ -4,7 +4,7 @@
 
 SECRET_KEY = 'test_s*kbi04s%5u921e+d52kaa(e=d)%i4w@s6a6u8-x&bij^l8!q-'
 
-ALLOWED_HOSTS = []
+ALLOWED_HOSTS = ['activflow']
 
 # Application definition
 
@@ -20,15 +20,14 @@
     'activflow.tests'
 )
 
-MIDDLEWARE_CLASSES = (
+MIDDLEWARE = (
+    'django.middleware.security.SecurityMiddleware',
     'django.contrib.sessions.middleware.SessionMiddleware',
     'django.middleware.common.CommonMiddleware',
     'django.middleware.csrf.CsrfViewMiddleware',
     'django.contrib.auth.middleware.AuthenticationMiddleware',
-    'django.contrib.auth.middleware.SessionAuthenticationMiddleware',
     'django.contrib.messages.middleware.MessageMiddleware',
     'django.middleware.clickjacking.XFrameOptionsMiddleware',
-    'django.middleware.security.SecurityMiddleware',
 )
 
 ROOT_URLCONF = 'activflow.urls'

activflow/settings/staging.py

@@ -9,6 +9,7 @@
         'ENGINE': 'django.db.backends.postgresql',
         'NAME': 'postgres',
         'USER': 'postgres',
+        'PASSWORD': 'password',
         'HOST': 'db',
         'PORT': 5432,
     }

activflow/tests/models.py

@@ -4,7 +4,8 @@
     CharField,
     ForeignKey,
     IntegerField,
-    TextField)
+    TextField,
+    CASCADE)
 
 from activflow.core.models import (
     AbstractEntity,
@@ -28,7 +29,7 @@ def clean(self):
 
 class FooLineItem(AbstractEntity):
     """Sample representation of Foo Line Item"""
-    foo = ForeignKey(Foo, related_name="lines")
+    foo = ForeignKey(Foo, related_name="lines", on_delete=CASCADE)
     plugh = CharField(
         "Plugh", max_length=200, validators=[validate_initial_cap])
     thud = CharField(verbose_name="Thud", max_length=30, choices=(
@@ -46,7 +47,7 @@ def clean(self):
 
 class FooMoreLineItem(AbstractEntity):
     """Sample representation of FooMore Line Item"""
-    foo = ForeignKey(Foo, related_name="morelines")
+    foo = ForeignKey(Foo, related_name="morelines", on_delete=CASCADE)
     plughmore = CharField(
         "Plughmore", max_length=200, validators=[validate_initial_cap])
     thudmore = CharField(verbose_name="Thudmore", max_length=30, choices=(

activflow/tests/tests.py

@@ -1,6 +1,7 @@
 """Tests for Core app"""
 from django.contrib.auth.models import User, Group
-from django.core.urlresolvers import reverse
+from django.urls import reverse
+
 from django.test import TestCase
 from django.test import Client
 

activflow/urls.py

@@ -5,7 +5,7 @@
 
 
 urlpatterns = [
-    url(r'^admin/', include(admin.site.urls)),
+    url(r'^admin/', admin.site.urls),
     url(r'^auth/', include('django.contrib.auth.urls')),
     url(r'', include('activflow.core.urls')),
 ]

docker-compose.yml

@@ -4,6 +4,8 @@ services:
   db:
     image: postgres
     hostname: db
+    environment:
+      - POSTGRES_PASSWORD=password
     networks:
       activflow-net:
   app: