Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
jovuit
funkwhale
Commits
02debeb9
Commit
02debeb9
authored
Oct 17, 2019
by
Eliot Berriot
Browse files
Resolve "Library Upload: missing retry upload button"
parent
109c4906
Changes
2
Hide whitespace changes
Inline
Side-by-side
changes/changelog.d/942.enhancement
0 → 100644
View file @
02debeb9
Added a retry option for failed uploads (#942)
front/src/components/library/FileUpload.vue
View file @
02debeb9
...
...
@@ -91,9 +91,20 @@
<table
class=
"ui unstackable table"
>
<thead>
<tr>
<th><translate
translate-context=
"Content/Library/Table.Label"
>
Filename
</translate></th>
<th
class=
"ten wide"
><translate
translate-context=
"Content/Library/Table.Label"
>
Filename
</translate></th>
<th><translate
translate-context=
"Content/*/*/Noun"
>
Size
</translate></th>
<th><translate
translate-context=
"*/*/*"
>
Status
</translate></th>
<th><translate
translate-context=
"*/*/*"
>
Actions
</translate></th>
</tr>
<tr
v-if=
"retryableFiles.length > 1"
>
<th
class=
"ten wide"
></th>
<th></th>
<th></th>
<th>
<button
class=
"ui right floated small basic button"
@
click.prevent=
"retry(retryableFiles)"
>
<translate
translate-context=
"Content/Library/Table"
>
Retry failed uploads
</translate>
</button>
</th>
</tr>
</thead>
<tbody>
...
...
@@ -113,9 +124,20 @@
<translate
translate-context=
"Content/Library/Table"
key=
"2"
>
Uploading…
</translate>
(
{{
parseInt
(
file
.
progress
)
}}
%)
</span>
<template
v-else
>
<span
class=
"ui label"
><translate
translate-context=
"Content/Library/*/Short"
key=
"3"
>
Pending
</translate></span>
<button
class=
"ui tiny basic red icon button"
@
click.prevent=
"$refs.upload.remove(file)"
><i
class=
"delete icon"
></i></button>
<span
v-else
class=
"ui label"
><translate
translate-context=
"Content/Library/*/Short"
key=
"3"
>
Pending
</translate></span>
</td>
<td>
<template
v-if=
"file.error"
>
<button
class=
"ui tiny basic icon right floated button"
:title=
"labels.retry"
@
click.prevent=
"retry([file])"
v-if=
"retryableFiles.indexOf(file) > -1"
>
<i
class=
"redo icon"
></i>
</button>
</
template
>
<
template
v-else-if=
"!file.success"
>
<button
class=
"ui tiny basic red icon right floated button"
@
click.prevent=
"$refs.upload.remove(file)"
><i
class=
"delete icon"
></i></button>
</
template
>
</td>
</tr>
...
...
@@ -251,6 +273,13 @@ export default {
self
.
uploads
.
objects
[
event
.
upload
.
uuid
]
=
event
.
upload
;
self
.
needsRefresh
=
true
});
},
retry
(
files
)
{
files
.
forEach
((
file
)
=>
{
this
.
$refs
.
upload
.
update
(
file
,
{
error
:
''
,
progress
:
'
0.00
'
})
})
this
.
$refs
.
upload
.
active
=
true
;
}
},
computed
:
{
...
...
@@ -274,6 +303,7 @@ export default {
server
,
network
,
timeout
,
retry
:
this
.
$pgettext
(
'
*/*/*/Verb
'
,
"
Retry
"
),
extension
:
this
.
$gettextInterpolate
(
extension
,
{
extensions
:
this
.
supportedExtensions
.
join
(
"
,
"
)
})
...
...
@@ -295,6 +325,11 @@ export default {
return
f
.
error
;
}).
length
;
},
retryableFiles
()
{
return
this
.
files
.
filter
(
f
=>
{
return
f
.
error
;
});
},
processableFiles
()
{
return
(
this
.
uploads
.
pending
+
...
...
@@ -342,7 +377,9 @@ export default {
uploadedSize
()
{
let
uploaded
=
0
this
.
files
.
forEach
((
f
)
=>
{
uploaded
+=
f
.
size
*
(
f
.
progress
/
100
)
if
(
!
f
.
error
)
{
uploaded
+=
f
.
size
*
(
f
.
progress
/
100
)
}
})
return
uploaded
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a 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