From ce2f65680517ddff6bb5415bdfb48085829c50aa Mon Sep 17 00:00:00 2001 From: Adam Goldsmith Date: Mon, 14 Feb 2022 15:24:08 -0500 Subject: [PATCH] Remove router for paperwork (just use default db instead) --- cmsmanage/settings/base.py | 1 - membershipworks/routers.py | 8 ++++++++ paperwork/routers.py | 22 ---------------------- 3 files changed, 8 insertions(+), 23 deletions(-) delete mode 100644 paperwork/routers.py diff --git a/cmsmanage/settings/base.py b/cmsmanage/settings/base.py index ec5e62d..6d32769 100644 --- a/cmsmanage/settings/base.py +++ b/cmsmanage/settings/base.py @@ -71,7 +71,6 @@ WSGI_APPLICATION = "cmsmanage.wsgi.application" DATABASE_ROUTERS = [ "membershipworks.routers.MembershipWorksRouter", - "paperwork.routers.PaperworkRouter", ] # Default URL to redirect to after authentication diff --git a/membershipworks/routers.py b/membershipworks/routers.py index 29f8e61..6a3b071 100644 --- a/membershipworks/routers.py +++ b/membershipworks/routers.py @@ -16,3 +16,11 @@ class MembershipWorksRouter: if db == self.db: return False return None + + def allow_relation(self, obj1, obj2, **hints): + if ( + obj1._meta.app_label == self.app_label + or obj2._meta.app_label == self.app_label + ): + return True + return None diff --git a/paperwork/routers.py b/paperwork/routers.py deleted file mode 100644 index ec907a5..0000000 --- a/paperwork/routers.py +++ /dev/null @@ -1,22 +0,0 @@ -class PaperworkRouter: - app_label = "paperwork" - related_app_labels = {"paperwork", "membershipworks"} - db = "cms" - - def db_for_read(self, model, **hints): - if model._meta.app_label == self.app_label: - return self.db - return None - - def db_for_write(self, model, **hints): - if model._meta.app_label == self.app_label: - return self.db - return None - - def allow_relation(self, obj1, obj2, **hints): - if ( - obj1._meta.app_label in self.related_app_labels - or obj2._meta.app_label in self.related_app_labels - ): - return True - return None