diff options
author | Matthew Lemon <matt@matthewlemon.com> | 2020-02-25 07:10:34 +0000 |
---|---|---|
committer | Matthew Lemon <matt@matthewlemon.com> | 2020-02-25 07:10:34 +0000 |
commit | fdf52fb15cb594f8717b852c33a292149a21b8b8 (patch) | |
tree | 47231f250e2558893c167c189f58a1e8b14d0a9c | |
parent | 257d5fbdc2b6336f5a3799aeec3bc906348d59ee (diff) |
tiding
Diffstat (limited to '')
-rw-r--r-- | config/settings/base.py | 2 | ||||
-rw-r--r-- | config/urls.py | 1 | ||||
-rw-r--r-- | ctrack/caf/models.py | 3 | ||||
-rw-r--r-- | ctrack/caf/tests.py | 3 |
4 files changed, 3 insertions, 6 deletions
diff --git a/config/settings/base.py b/config/settings/base.py index 12973a6..83317ca 100644 --- a/config/settings/base.py +++ b/config/settings/base.py @@ -70,7 +70,7 @@ THIRD_PARTY_APPS = [ "crispy_forms", "allauth", "allauth.account", -# "allauth.socialaccount", + "allauth.socialaccount", "rest_framework", ] diff --git a/config/urls.py b/config/urls.py index cd7f6f2..43bec0d 100644 --- a/config/urls.py +++ b/config/urls.py @@ -21,7 +21,6 @@ urlpatterns = [ "organisations/", include("ctrack.organisations.urls", namespace="organisations"), ), - path("register/", include("ctrack.organisations.urls", namespace="register")), path("caf/", include("ctrack.caf.urls", namespace="caf")), path("accounts/", include("allauth.urls")), # Your stuff: custom urls includes go here diff --git a/ctrack/caf/models.py b/ctrack/caf/models.py index 5426fd9..14b2650 100644 --- a/ctrack/caf/models.py +++ b/ctrack/caf/models.py @@ -19,6 +19,7 @@ class Ranking(models.Model): description = models.TextField(max_length=250) type = models.IntegerField(choices=RANKING_TYPE, default=1) + def __str__(self): return self.descriptor @@ -75,7 +76,7 @@ class EssentialService(models.Model): verbose_name = "Essential Service" def __str__(self): - return self.name + return f"{self.organisation.name} | {self.name}" class CAF(models.Model): diff --git a/ctrack/caf/tests.py b/ctrack/caf/tests.py deleted file mode 100644 index 4d66077..0000000 --- a/ctrack/caf/tests.py +++ /dev/null @@ -1,3 +0,0 @@ -#from django.test import TestCase - -# Create your tests here. |