From 0d8cb2e006b65a5bba4d7b51a59f841ece870fe0 Mon Sep 17 00:00:00 2001
From: Kostas Papadimitriou <kpap@grnet.gr>
Date: Tue, 20 Oct 2015 15:38:36 +0300
Subject: [PATCH] BASE_PATH -> BASE_URL
---
conf/20-snf-ui-settings.conf | 2 +-
synnefo_ui/ui_settings.py | 6 +++---
synnefo_ui/urls.py | 6 +++---
synnefo_ui/views.py | 2 +-
4 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/conf/20-snf-ui-settings.conf b/conf/20-snf-ui-settings.conf
index 1d6949a8..08b23f69 100644
--- a/conf/20-snf-ui-settings.conf
+++ b/conf/20-snf-ui-settings.conf
@@ -1,5 +1,5 @@
# The path under which the ui views will be served from
-#UI_PATH = "/ui/"
+#UI_BASE_URL = "/ui/"
# The path used to serve the astakos identity and account endpoints.
#UI_ASTAKOS_PROXY_PATH = "_astakos"
diff --git a/synnefo_ui/ui_settings.py b/synnefo_ui/ui_settings.py
index 39a886b7..d4ee45f9 100644
--- a/synnefo_ui/ui_settings.py
+++ b/synnefo_ui/ui_settings.py
@@ -19,18 +19,18 @@ from django.conf import settings
from synnefo.lib import parse_base_url
-BASE_PATH = getattr(settings, 'UI_BASE_PATH', '/ui/')
+BASE_URL = getattr(settings, 'UI_BASE_URL', '/ui/')
AUTH_METHOD = getattr(settings, 'UI_AUTH_METHOD', 'cookie:_pithos2_a')
PROXY_PATH = getattr(settings, 'UI_ASTAKOS_PROXY_PATH', '_astakos')
ASTAKOS_IDENTITY_PROXY_PATH = getattr(settings,
'UI_ASTAKOS_IDENTITY_PROXY_PATH',
- '%s%s/identity' % (BASE_PATH, PROXY_PATH))
+ '%s%s/identity' % (BASE_URL, PROXY_PATH))
ASTAKOS_ACCOUNT_PROXY_PATH = getattr(settings,
'UI_ASTAKOS_ACCOUNT_PROXY_PATH',
- '%s%s/account' % (BASE_PATH, PROXY_PATH))
+ '%s%s/account' % (BASE_URL, PROXY_PATH))
COMMON_AUTH_URL = getattr(settings, 'ASTAKOS_AUTH_URL', None)
ASTAKOS_ACCOUNT_BASE_URL = getattr(settings,
diff --git a/synnefo_ui/urls.py b/synnefo_ui/urls.py
index 4eb1de39..1f0b5328 100644
--- a/synnefo_ui/urls.py
+++ b/synnefo_ui/urls.py
@@ -23,7 +23,7 @@ from snf_django.lib.api.urls import api_patterns
from snf_django.lib.api import api_endpoint_not_found
from snf_django.utils.urls import extend_path_with_slash
-from synnefo_ui.ui_settings import BASE_PATH, ASTAKOS_IDENTITY_PROXY_PATH, \
+from synnefo_ui.ui_settings import BASE_URL, ASTAKOS_IDENTITY_PROXY_PATH, \
ASTAKOS_IDENTITY_BASE_URL, ASTAKOS_ACCOUNT_PROXY_PATH, \
ASTAKOS_ACCOUNT_BASE_URL
@@ -54,7 +54,7 @@ ui_patterns = patterns(
urlpatterns = proxy_patterns
urlpatterns += patterns(
'',
- (prefix_pattern(BASE_PATH), include(ui_patterns)))
+ (prefix_pattern(BASE_URL), include(ui_patterns)))
-extend_path_with_slash(urlpatterns, BASE_PATH);
+extend_path_with_slash(urlpatterns, BASE_URL);
diff --git a/synnefo_ui/views.py b/synnefo_ui/views.py
index 2e44316b..7caf9596 100644
--- a/synnefo_ui/views.py
+++ b/synnefo_ui/views.py
@@ -41,7 +41,7 @@ def app(request):
context = {
'app_settings': json.dumps(app_settings),
'UI_MEDIA_URL': ui_settings.UI_MEDIA_URL,
- 'UI_BASE_URL': ui_settings.BASE_PATH
+ 'UI_BASE_URL': ui_settings.BASE_URL
}
return direct_to_template(request, "snf_ui_index.html",
extra_context=context)
--
GitLab