Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
S
snf-ui-app
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
itminedu
snf-ui-app
Commits
0d8cb2e0
Commit
0d8cb2e0
authored
Oct 20, 2015
by
Kostas Papadimitriou
Committed by
Athina Bekakou
Dec 03, 2015
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
BASE_PATH -> BASE_URL
parent
5ab2f557
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
8 additions
and
8 deletions
+8
-8
conf/20-snf-ui-settings.conf
conf/20-snf-ui-settings.conf
+1
-1
synnefo_ui/ui_settings.py
synnefo_ui/ui_settings.py
+3
-3
synnefo_ui/urls.py
synnefo_ui/urls.py
+3
-3
synnefo_ui/views.py
synnefo_ui/views.py
+1
-1
No files found.
conf/20-snf-ui-settings.conf
View file @
0d8cb2e0
# 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"
...
...
synnefo_ui/ui_settings.py
View file @
0d8cb2e0
...
...
@@ -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
,
...
...
synnefo_ui/urls.py
View file @
0d8cb2e0
...
...
@@ -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
);
synnefo_ui/views.py
View file @
0d8cb2e0
...
...
@@ -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
)
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment