Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
S
snf-ui-app
Manage
Activity
Members
Labels
Plan
Issues
0
Issue boards
Milestones
Wiki
Code
Merge requests
0
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
itminedu
snf-ui-app
Commits
0d8cb2e0
Commit
0d8cb2e0
authored
9 years ago
by
Kostas Papadimitriou
Committed by
Athina Bekakou
9 years ago
Browse files
Options
Downloads
Patches
Plain Diff
BASE_PATH -> BASE_URL
parent
5ab2f557
No related branches found
No related tags found
No related merge requests found
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
conf/20-snf-ui-settings.conf
+1
-1
1 addition, 1 deletion
conf/20-snf-ui-settings.conf
synnefo_ui/ui_settings.py
+3
-3
3 additions, 3 deletions
synnefo_ui/ui_settings.py
synnefo_ui/urls.py
+3
-3
3 additions, 3 deletions
synnefo_ui/urls.py
synnefo_ui/views.py
+1
-1
1 addition, 1 deletion
synnefo_ui/views.py
with
8 additions
and
8 deletions
conf/20-snf-ui-settings.conf
+
1
−
1
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"
...
...
This diff is collapsed.
Click to expand it.
synnefo_ui/ui_settings.py
+
3
−
3
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
,
...
...
This diff is collapsed.
Click to expand it.
synnefo_ui/urls.py
+
3
−
3
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
);
This diff is collapsed.
Click to expand it.
synnefo_ui/views.py
+
1
−
1
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
)
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment