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
nomad-lab
nomad-FAIR
Commits
70019d9f
Commit
70019d9f
authored
Aug 20, 2019
by
Markus Scheidgen
Browse files
Merge branch 'v0.5.1-bugfixes' into 'master'
Merge for v0.5.1 release (RC2) See merge request
!52
parents
53fa1e8c
dd47d6a1
Pipeline
#54056
passed with stage
in 17 seconds
Changes
2
Pipelines
2
Hide whitespace changes
Inline
Side-by-side
gui/src/components/uploads/Upload.js
View file @
70019d9f
...
...
@@ -109,16 +109,18 @@ class Upload extends React.Component {
return
}
console
.
log
(
'
hello 2
'
)
const
{
page
,
perPage
,
orderBy
,
order
}
=
this
.
state
.
params
const
wasPublished
=
this
.
state
.
published
this
.
state
.
upload
.
get
(
page
,
perPage
,
orderBy
,
order
===
'
asc
'
?
1
:
-
1
)
.
then
(
upload
=>
{
const
{
tasks_running
,
process_running
,
current_task
,
published
}
=
upload
if
(
!
this
.
_unmounted
)
{
if
(
published
)
{
if
(
published
&&
!
wasPublished
)
{
if
(
this
.
props
.
onPublished
)
{
this
.
props
.
onPublished
()
}
return
}
const
continueUpdating
=
tasks_running
||
process_running
||
current_task
===
'
uploading
'
this
.
setState
({
upload
:
upload
,
updating
:
continueUpdating
})
...
...
@@ -141,6 +143,7 @@ class Upload extends React.Component {
}
componentDidMount
()
{
console
.
log
(
'
hello 1
'
)
this
.
update
()
}
...
...
nomad/processing/data.py
View file @
70019d9f
...
...
@@ -870,7 +870,7 @@ class Upload(Proc):
base
=
config
.
api_url
()[:
-
3
]
if
base
.
endswith
(
'/'
):
base
=
base
[:
-
1
]
return
'%s/uploads/'
%
base
return
'%s/
gui/
uploads/'
%
base
def
_cleanup_after_processing
(
self
):
# send email about process finish
...
...
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