Upgrade django-polymorphic

I'm not in the habit of testing the admin interface, so I don't know what things _were_ like. But after this change, it's impossible to delete a workflow from the admin interface. Probably related to jazzband/django-polymorphic#229 which was never fixed; our workaround for it stopped working (and I'm keen to delete that workaround anyway, because we veered way into jank-ville here).
CJWorkbench · May 3, 2019 · 803f4d0 · 803f4d0
1 parent 8fdc751
commit 803f4d0
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 10 deletions.
diff --git a/Pipfile b/Pipfile
@@ -9,7 +9,7 @@ aiohttp = "==3.5.4"
 channels = "==2.2.0"
 Django = "==1.11.20"
 "django-allauth" = "==0.37.0"
-"django-polymorphic" = "==1.3"
+django-polymorphic = "~=2.0.3"
 djangorestframework = "~=3.9.3"
 "django-user-accounts" = "==2.1.0"
 "django-webpack-loader" = "==0.6.0"

diff --git a/Pipfile.lock b/Pipfile.lock
diff --git a/server/models/Delta.py b/server/models/Delta.py
@@ -29,11 +29,6 @@ def _prepare_json(data: Any) -> Any:
 # When creating a Delta, the two commands will be called in the same atomic
 # transaction.
 class Delta(PolymorphicModel):
-    class Meta:
-        # OMG this bug ate so many hours...
-        # https://github.com/django-polymorphic/django-polymorphic/issues/229
-        base_manager_name = 'base_objects'
-
     # These fields must be set by any child classes, when instantiating
     workflow = models.ForeignKey('Workflow', related_name='deltas',
                                  on_delete=models.CASCADE)