Merge branch 'master' of ssh://git.xkjq.uk:30001/ross/rad

rad/settings.py

@@ -23,7 +23,7 @@ with open('/etc/secret_key') as f:
     SECRET_KEY = f.read().strip()
 
 # SECURITY WARNING: don't run with debug turned on in production!
-DEBUG = False
+DEBUG = True
 
 ALLOWED_HOSTS = ["localhost", "127.0.0.1", "161.35.163.87", "penracourses.org.uk"]
 
@@ -32,6 +32,7 @@ ALLOWED_HOSTS = ["localhost", "127.0.0.1", "161.35.163.87", "penracourses.org.uk
 INSTALLED_APPS = [
     'anatomy',
     'physics',
+    'rapids',
     "reversion",
     "django_tables2",
     "django_filters",
@@ -46,7 +47,7 @@ INSTALLED_APPS = [
     'django.contrib.messages',
     'django.contrib.staticfiles',
     'debug_toolbar',
-    #"tagulous",
+    "tagulous",
 ]
 
 MIDDLEWARE = [
@@ -120,12 +121,12 @@ AUTH_PASSWORD_VALIDATORS = [
     },
 ]
 
-#SERIALIZATION_MODULES = {
-#    "xml": "tagulous.serializers.xml_serializer",
-#    "json": "tagulous.serializers.json",
-#    "python": "tagulous.serializers.python",
-#    "yaml": "tagulous.serializers.pyyaml",
-#}
+SERIALIZATION_MODULES = {
+    "xml": "tagulous.serializers.xml_serializer",
+    "json": "tagulous.serializers.json",
+    "python": "tagulous.serializers.python",
+    "yaml": "tagulous.serializers.pyyaml",
+}
 
 # Internationalization
 # https://docs.djangoproject.com/en/1.11/topics/i18n/
@@ -154,20 +155,20 @@ REMOTE_URL = "http://penracourses.org.uk"
 MEDIA_URL = '/media/'
 MEDIA_ROOT = os.path.join(BASE_DIR, 'media/')
 
-if DEBUG:
-    MEDIA_URL = REMOTE_URL + MEDIA_URL
+#if DEBUG:
+#    MEDIA_URL = REMOTE_URL + MEDIA_URL
 
 # Redirect to home URL after login (Default redirects to /accounts/profile/)
 LOGIN_REDIRECT_URL = "/"
 
-#TAGULOUS_AUTOCOMPLETE_JS = (
-#"tagulous/lib/jquery.js",
-#"tagulous/lib/select2-3/select2.min.js",
-#"tagulous/tagulous.js",
-#"tagulous/adaptor/select2-3.js",
-#)
+TAGULOUS_AUTOCOMPLETE_JS = (
+"tagulous/lib/jquery.js",
+"tagulous/lib/select2-3/select2.min.js",
+"tagulous/tagulous.js",
+"tagulous/adaptor/select2-3.js",
+)
 
-#TAGULOUS_AUTOCOMPLETE_CSS = {"all": ["tagulous/lib/select2-3/select2.css"]}
+TAGULOUS_AUTOCOMPLETE_CSS = {"all": ["tagulous/lib/select2-3/select2.css"]}
 
 INTERNAL_IPS = ["localhost", "127.0.0.1"]
 

rad/urls.py

@@ -27,7 +27,7 @@ urlpatterns = [
     path("anatomy/", include("anatomy.urls"), name="anatomy"),
     path("physics/", include("physics.urls"), name="physics"),
     #path("sbas/", include("sbas.urls"), name="sbas"),
-    #path("rapids/", include("rapids.urls"), name="rapids"),
+    path("rapids/", include("rapids.urls"), name="rapids"),
     path("accounts/", include("django.contrib.auth.urls")),
     path("accounts/profile", views.profile, name="profile"),
     path("", TemplateView.as_view(template_name="index.html"), name="home"),