Commit b3e78808 authored by anton's avatar anton

Update from release_2_1

parents e461522a 46dbd7cf
Pipeline #63875 passed with stage
in 4 minutes and 9 seconds
......@@ -17,15 +17,19 @@ reference date, if available (e.g. live streams)
- `Live` indicator for YouTube live streams in post-annotator
- Edit media screen allows adding duration for live streams once archived
- Duration field on edit media screen
- Add media screen refuses to add inaccessible videos
- Metadata store relays 'not found' and 'access denied' errors
### Changed
- Add media screen explicitly shows option for overriding or auto-detecting media start times
- Make Media duration in post-annotator dynamic
- Enable CSV export on `timelines/edit`
### Fixed
- Exception on edit media screen when media duration is unknown
- Exception in `UserNav` when `route.name` is undefined
### Updated
......
Subproject commit ac9c539828579ce2443528f622896ccea11dac82
Subproject commit 379ed2b44384f666567f8d101079201cb40d2a0f
......@@ -125,7 +125,9 @@ export default {
remove_invitation_failed: 'Failed to remove invitation: {error}',
add_media_forbidden: 'You are not allowed to add media to this Timeline.',
editing_forbidden: 'You are not allowed to edit this item.',
annotate_timeline_forbidden: 'You are not allowed to annotate this Timeline.'
annotate_timeline_forbidden: 'You are not allowed to annotate this Timeline.',
media_could_not_be_accessed: 'The supplied media URL could not be accessed.',
access_to_media_denied: 'Access to the media URL was denied.'
},
labels: {
rejected: 'Rejected.',
......
......@@ -89,7 +89,14 @@
},
submit: {
async handler () {
await _this.fetchMetadata()
try {
await _this.fetchMetadata()
}
catch (err) {
if (err.message && err.message.indexOf('ENOENT') === 0) throw new Error('errors.media_could_not_be_accessed')
if (err.message && err.message.indexOf('EACCESS') === 0) throw new Error('errors.access_to_media_denied')
else throw err
}
let
start = _this.selectorValue,
end
......
......@@ -12,8 +12,8 @@
q-btn.col(v-if="$route.params.uuid", slot="form-buttons-add",
:label="exportLabel", @click="exportTimeline",
color="grey", :class="[!isMobile ? 'q-mr-sm' : '']")
// q-btn(v-if="$route.params.uuid", @click="exportCSV", color="grey",
// :class="[!isMobile ? 'q-mr-sm' : '']", :label="exportLabelCSV")
q-btn(v-if="$route.params.uuid", @click="exportCSV", color="grey",
:class="[!isMobile ? 'q-mr-sm' : '']", :label="exportLabelCSV")
p(v-if="acl.put === false") {{ $t('errors.editing_forbidden') }}
// -------------------------------------------------------------------------------------------------- access control
......
......@@ -41,7 +41,8 @@ const metadata = {
}
}
catch (err) {
console.error('metadta', err)
if (err.message && err.message.indexOf('ENOENT') === 0) throw new Error(err.message)
if (err.message && err.message.indexOf('EACCESS') === 0) throw new Error(err.message)
if (!err.response || err.response.status > 404) console.error(err.message)
}
}
......
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