From 37cce170f0a534864dcbf9dfaca6c553a1976994 Mon Sep 17 00:00:00 2001 From: Sergio Oliveira Date: Sat, 20 Sep 2014 18:00:42 -0300 Subject: [PATCH] Moved Trac router to trac app --- src/colab/custom_settings.py | 2 +- src/colab/routers.py | 23 ----------------------- src/proxy/trac/routers.py | 23 +++++++++++++++++++++++ 3 files changed, 24 insertions(+), 24 deletions(-) delete mode 100644 src/colab/routers.py create mode 100644 src/proxy/trac/routers.py diff --git a/src/colab/custom_settings.py b/src/colab/custom_settings.py index 977449c..9d87f60 100644 --- a/src/colab/custom_settings.py +++ b/src/colab/custom_settings.py @@ -86,7 +86,7 @@ CACHES = { } } -DATABASE_ROUTERS = ['colab.routers.TracRouter',] +DATABASE_ROUTERS = ['proxy.trac.routers.TracRouter',] INSTALLED_APPS = INSTALLED_APPS + ( # First app to provide AUTH_USER_MODEL to others diff --git a/src/colab/routers.py b/src/colab/routers.py deleted file mode 100644 index 9d053cb..0000000 --- a/src/colab/routers.py +++ /dev/null @@ -1,23 +0,0 @@ -class TracRouter(object): - def db_for_read(self, model, **hints): - if model._meta.app_label == 'proxy': - return 'trac' - return None - - def db_for_write(self, model, **hints): - if model._meta.app_label == 'proxy': - return 'trac' - return None - - def allow_relation(self, obj1, obj2, **hints): - if obj1._meta.app_label == 'proxy' or \ - obj2._meta.app_label == 'proxy': - return True - return None - - def allow_migrate(self, db, model): - if db == 'trac': - return model._meta.app_label == 'proxy' - elif model._meta.app_label == 'proxy': - False - return None diff --git a/src/proxy/trac/routers.py b/src/proxy/trac/routers.py new file mode 100644 index 0000000..9d053cb --- /dev/null +++ b/src/proxy/trac/routers.py @@ -0,0 +1,23 @@ +class TracRouter(object): + def db_for_read(self, model, **hints): + if model._meta.app_label == 'proxy': + return 'trac' + return None + + def db_for_write(self, model, **hints): + if model._meta.app_label == 'proxy': + return 'trac' + return None + + def allow_relation(self, obj1, obj2, **hints): + if obj1._meta.app_label == 'proxy' or \ + obj2._meta.app_label == 'proxy': + return True + return None + + def allow_migrate(self, db, model): + if db == 'trac': + return model._meta.app_label == 'proxy' + elif model._meta.app_label == 'proxy': + False + return None -- libgit2 0.21.2