Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
genotoul-bioinfo
jflow
Commits
32733637
Commit
32733637
authored
Jan 06, 2017
by
Floreal Cabanettes
Browse files
rename server storage -> browse root dir
parent
16d4c653
Changes
3
Hide whitespace changes
Inline
Side-by-side
application.properties.example
View file @
32733637
...
...
@@ -56,7 +56,7 @@ work_directory = <path>/work
# Where should the pipelines write temporary files, should be
# accessible by all cluster nodes
tmp_directory = <path>/tmp
server_storage
= <path>
browse_root_dir
= <path>
[softwares]
# uncomment and set if not in the PATH
...
...
src/jflow/config_reader.py
View file @
32733637
...
...
@@ -125,5 +125,5 @@ class JFlowConfigReader(object):
except
:
return
""
def
get_
storage_folde
r
(
self
):
return
self
.
reader
.
get
(
"storage"
,
"
server_storage
"
)
def
get_
browse_root_di
r
(
self
):
return
self
.
reader
.
get
(
"storage"
,
"
browse_root_dir
"
)
src/jflow/server.py
View file @
32733637
...
...
@@ -125,9 +125,9 @@ class JFlowServer (object):
self
.
jflow_config_reader
=
JFlowConfigReader
()
@
staticmethod
def
get_
storage_folde
r
():
def
get_
browse_root_di
r
():
jflowconf
=
JFlowConfigReader
()
return
jflowconf
.
get_
storage_folde
r
()
return
jflowconf
.
get_
browse_root_di
r
()
@
staticmethod
def
quickstart
(
server_class
,
config
=
None
,
daemon
=
False
):
...
...
@@ -583,7 +583,7 @@ class JFlowServer (object):
r
=
[
'<ul class="jqueryFileTree" style="display: none;">'
]
try
:
r
=
[
'<ul class="jqueryFileTree" style="display: none;">'
]
d
=
kwargs
[
"dir"
]
if
kwargs
[
"dir"
]
!=
"/"
else
self
.
get_
storage_folde
r
()
d
=
kwargs
[
"dir"
]
if
kwargs
[
"dir"
]
!=
"/"
else
self
.
get_
browse_root_di
r
()
for
f
in
self
.
sort_files
(
os
.
listdir
(
d
),
d
):
ff
=
os
.
path
.
join
(
d
,
f
)
if
os
.
path
.
isdir
(
ff
):
...
...
Write
Preview
Supports
Markdown
0%
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!
Cancel
Please
register
or
sign in
to comment