1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
|
--- a/OmniDB/OmniDB/settings.py
+++ b/OmniDB/OmniDB/settings.py
@@ -151,8 +151,8 @@ elif PATH != '':
PATH = PATH[:-1]
-LOGIN_URL = PATH + '/omnidb_login'
-LOGIN_REDIRECT_URL = PATH + '/'
+LOGIN_URL = 'login'
+LOGIN_REDIRECT_URL = 'check_session'
STATIC_URL = PATH + '/static/'
STATIC_ROOT = os.path.join(BASE_DIR, "OmniDB_app/static")
--- a/OmniDB/OmniDB_app/urls.py
+++ b/OmniDB/OmniDB_app/urls.py
@@ -4,7 +4,7 @@ from . import views
from django.conf import settings
from django.conf.urls.static import static
-base_urlpatterns = [
+urlpatterns = [
path('social-auth/', include('social_django.urls', namespace="social")),
@@ -295,13 +295,3 @@ base_urlpatterns = [
url(r'^update_saved_monitor_unit_interval/', views.monitor_dashboard.update_saved_monitor_unit_interval, name='update_saved_monitor_unit_interval'),
] + static(settings.STATIC_URL, document_root=settings.STATIC_ROOT)
-
-if settings.PATH == '':
- v_url = ''
-else:
- v_url = settings.PATH[1:] + '/'
-
-urlpatterns = [# if you wish to maintain the un-prefixed URL's too
- url(v_url, include(base_urlpatterns)),
- #url(r'^subfolder/', include(base_urlpatterns))
-]
|
