Merge pull request #6 from acdh-oeaw/bugfix/login-redirect

Bugfix/login redirect

apis_ontology/settings/server_settings.py

@@ -6,14 +6,23 @@
 APIS_BASE_URI = "https://tibschol.acdh-ch.oeaw.ac.at/"
 
 ROOT_URLCONF = "apis_ontology.urls"
+CSRF_TRUSTED_ORIGINS = [
+    "https://tibschol.acdh-ch.oeaw.ac.at",
+    "https://tibschol-test.acdh-ch-dev.oeaw.ac.at",
+]
 
 INSTALLED_APPS += [
     "apis_core.relations",
     "apis_highlighter",
     "django.contrib.postgres",
     "apis_core.collections",
     "apis_core.history",
+    "django_action_logger",
+    "django_acdhch_functions",
 ]
+INSTALLED_APPS.remove("apis_ontology")
+INSTALLED_APPS.insert(0, "apis_ontology")
+
 
 LOGGING = {
     "version": 1,

apis_ontology/urls.py

@@ -16,6 +16,9 @@
 ]
 
 urlpatterns += staticfiles_urlpatterns()
+urlpatterns += [
+    path("logger/", include("django_action_logger.urls")),
+]
 urlpatterns += [
     path("", include("django_acdhch_functions.urls")),
 ]

manage.py

@@ -0,0 +1,22 @@
+import os
+import sys
+
+if __name__ == "__main__":
+
+    os.environ.setdefault("DJANGO_SETTINGS_MODULE", "apis_ontology.settings")
+    try:
+        from django.core.management import execute_from_command_line
+    except ImportError:
+        # The above import may fail for some other reason. Ensure that the
+        # issue is really that Django is missing to avoid masking other
+        # exceptions on Python 2.
+        try:
+            import django  # noqa
+        except ImportError:
+            raise ImportError(
+                "Couldn't import Django. Are you sure it's installed and "
+                "available on your PYTHONPATH environment variable? Did you "
+                "forget to activate a virtual environment?"
+            )
+        raise
+    execute_from_command_line(sys.argv)