Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
gga_load_data
Manage
Activity
Members
Labels
Plan
Issues
12
Issue boards
Milestones
Wiki
Code
Merge requests
5
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
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
abims
e-infra
gga_load_data
Commits
26331163
Commit
26331163
authored
3 years ago
by
Loraine Gueguen
Browse files
Options
Downloads
Patches
Plain Diff
fix picture_path in species template
parent
4230085a
No related branches found
Branches containing commit
No related tags found
Tags containing commit
1 merge request
!18
Release v2.1.0
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
templates/gspecies_compose.yml.j2
+1
-1
1 addition, 1 deletion
templates/gspecies_compose.yml.j2
utilities.py
+1
-2
1 addition, 2 deletions
utilities.py
with
2 additions
and
3 deletions
templates/gspecies_compose.yml.j2
+
1
−
1
View file @
26331163
...
...
@@ -42,7 +42,7 @@ services:
- ./banner.png:/var/www/html/banner.png:ro
{% endif %}
#- /groups/XXX/:/groups/XXX/:ro # We do this when we have symlinks in src_data pointing to /groups/XXX/...
{% if 'picture_path' is defined %}
{% if 'picture_path' is defined
and 'picture_path' != None
%}
{% if 'png' in picture_path %}
- ./species.png:/var/www/html/species.png:ro
{% endif %}
...
...
This diff is collapsed.
Click to expand it.
utilities.py
+
1
−
2
View file @
26331163
...
...
@@ -179,11 +179,10 @@ def get_sp_picture(sp_dict_list):
gspecies
=
get_gspecies_string_from_sp_dict
(
sp
)
if
gspecies
not
in
sp_picture_dict
.
keys
()
or
(
constants
.
ORG_PARAM_DESC_MAIN_SPECIES
in
sp
[
constants
.
ORG_PARAM_DESC
].
keys
()
and
sp
[
constants
.
ORG_PARAM_DESC
][
constants
.
ORG_PARAM_DESC_MAIN_SPECIES
]
==
True
):
sp_picture_dict
[
gspecies
]
=
""
# default value
sp_picture_dict
[
gspecies
]
=
""
if
constants
.
ORG_PARAM_DESC_PICTURE_PATH
in
sp
[
constants
.
ORG_PARAM_DESC
].
keys
()
and
\
sp
[
constants
.
ORG_PARAM_DESC
][
constants
.
ORG_PARAM_DESC_PICTURE_PATH
]
!=
""
:
sp_picture_dict
[
gspecies
]
=
sp
[
constants
.
ORG_PARAM_DESC
][
constants
.
ORG_PARAM_DESC_PICTURE_PATH
]
logging
.
debug
(
"
Species picture dictionary: {0}
"
.
format
(
sp_picture_dict
))
return
sp_picture_dict
def
run_tool
(
instance
,
tool_id
,
history_id
,
tool_inputs
):
...
...
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