Commit 70019d9f authored by Markus Scheidgen's avatar 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
...@@ -109,16 +109,18 @@ class Upload extends React.Component { ...@@ -109,16 +109,18 @@ class Upload extends React.Component {
return return
} }
console.log('hello 2')
const {page, perPage, orderBy, order} = this.state.params const {page, perPage, orderBy, order} = this.state.params
const wasPublished = this.state.published
this.state.upload.get(page, perPage, orderBy, order === 'asc' ? 1 : -1) this.state.upload.get(page, perPage, orderBy, order === 'asc' ? 1 : -1)
.then(upload => { .then(upload => {
const {tasks_running, process_running, current_task, published} = upload const {tasks_running, process_running, current_task, published} = upload
if (!this._unmounted) { if (!this._unmounted) {
if (published) { if (published && !wasPublished) {
if (this.props.onPublished) { if (this.props.onPublished) {
this.props.onPublished() this.props.onPublished()
} }
return
} }
const continueUpdating = tasks_running || process_running || current_task === 'uploading' const continueUpdating = tasks_running || process_running || current_task === 'uploading'
this.setState({upload: upload, updating: continueUpdating}) this.setState({upload: upload, updating: continueUpdating})
...@@ -141,6 +143,7 @@ class Upload extends React.Component { ...@@ -141,6 +143,7 @@ class Upload extends React.Component {
} }
componentDidMount() { componentDidMount() {
console.log('hello 1')
this.update() this.update()
} }
......
...@@ -870,7 +870,7 @@ class Upload(Proc): ...@@ -870,7 +870,7 @@ class Upload(Proc):
base = config.api_url()[:-3] base = config.api_url()[:-3]
if base.endswith('/'): if base.endswith('/'):
base = base[:-1] base = base[:-1]
return '%s/uploads/' % base return '%s/gui/uploads/' % base
def _cleanup_after_processing(self): def _cleanup_after_processing(self):
# send email about process finish # send email about process finish
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment