Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
LOFAR
Manage
Activity
Members
Labels
Plan
Issues
Wiki
Jira issues
Open Jira
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Code review analytics
Insights
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
RadioObservatory
LOFAR
Commits
7d620621
Commit
7d620621
authored
4 years ago
by
Auke Klazema
Committed by
Auke Klazema
4 years ago
Browse files
Options
Downloads
Patches
Plain Diff
TMSS-190
: Fix template and static file location
(cherry picked from commit
95be5268
)
parent
38c5998c
No related branches found
Branches containing commit
No related tags found
Tags containing commit
2 merge requests
!278
Resolve TMSS-477
,
!272
TMSS-190: Fix template and static file location
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
SAS/TMSS/docker-compose-scu199.yml
+1
-1
1 addition, 1 deletion
SAS/TMSS/docker-compose-scu199.yml
SAS/TMSS/src/tmss/settings.py
+2
-2
2 additions, 2 deletions
SAS/TMSS/src/tmss/settings.py
SAS/TMSS/src/tmss/tmssapp/views.py
+1
-1
1 addition, 1 deletion
SAS/TMSS/src/tmss/tmssapp/views.py
with
4 additions
and
4 deletions
SAS/TMSS/docker-compose-scu199.yml
+
1
−
1
View file @
7d620621
...
...
@@ -7,7 +7,7 @@ services:
env_file
:
-
./.env
network_mode
:
"
host"
command
:
bash -c 'source /opt/lofar/lofarinit.sh && ALLOWED_HOSTS=* tmss_test_environment -H 0.0.0.0 -P `hostname -f` -p 8008 -
-data
'
command
:
bash -c 'source /opt/lofar/lofarinit.sh && ALLOWED_HOSTS=* tmss_test_environment -H 0.0.0.0 -P `hostname -f` -p 8008 -
sSd
'
ports
:
-
"
8008:8008"
testprovider
:
...
...
This diff is collapsed.
Click to expand it.
SAS/TMSS/src/tmss/settings.py
+
2
−
2
View file @
7d620621
...
...
@@ -155,7 +155,7 @@ ROOT_URLCONF = 'lofar.sas.tmss.tmss.urls'
TEMPLATES
=
[
{
'
BACKEND
'
:
'
django.template.backends.django.DjangoTemplates
'
,
'
DIRS
'
:
[
BASE_DIR
,
os
.
path
.
join
(
BASE_DIR
,
'
templates
'
),
os
.
path
.
join
(
os
.
environ
.
get
(
'
LOFARROOT
'
),
'
SAS/TMSS/frontend
'
,
'
tmss_webapp
'
)],
'
DIRS
'
:
[
BASE_DIR
,
os
.
path
.
join
(
BASE_DIR
,
'
templates
'
),
os
.
path
.
join
(
os
.
environ
.
get
(
'
LOFARROOT
'
),
'
lib64/python3.6/site-packages/lofar/
SAS/TMSS/frontend
'
,
'
tmss_webapp
'
)],
'
APP_DIRS
'
:
True
,
'
OPTIONS
'
:
{
'
context_processors
'
:
[
...
...
@@ -169,7 +169,7 @@ TEMPLATES = [
]
STATICFILES_DIRS
=
[
os
.
path
.
join
(
os
.
environ
.
get
(
'
LOFARROOT
'
),
'
SAS/TMSS/frontend
'
,
'
tmss_webapp/build/static
'
)
os
.
path
.
join
(
os
.
environ
.
get
(
'
LOFARROOT
'
),
'
lib64/python3.6/site-packages/lofar/
SAS/TMSS/frontend
'
,
'
tmss_webapp/build/static
'
)
]
WSGI_APPLICATION
=
'
lofar.sas.tmss.tmss.wsgi.application
'
...
...
This diff is collapsed.
Click to expand it.
SAS/TMSS/src/tmss/tmssapp/views.py
+
1
−
1
View file @
7d620621
...
...
@@ -35,7 +35,7 @@ def subtask_parset(request, subtask_pk:int):
def
index
(
request
):
return
render
(
request
,
os
.
path
.
join
(
os
.
environ
.
get
(
'
LOFARROOT
'
),
'
SAS/TMSS/frontend
'
,
'
tmss_webapp/build/index.html
'
))
return
render
(
request
,
os
.
path
.
join
(
os
.
environ
.
get
(
'
LOFARROOT
'
),
'
lib64/python3.6/site-packages/lofar/
SAS/TMSS/frontend
'
,
'
tmss_webapp/build/index.html
'
))
#return render(request, "../../../frontend/frontend_poc/build/index.html")
...
...
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