diff options
| author | Jules Laplace <julescarbon@gmail.com> | 2020-07-16 18:55:00 +0200 |
|---|---|---|
| committer | Jules Laplace <julescarbon@gmail.com> | 2020-07-16 18:55:00 +0200 |
| commit | dc35755748ee05abde3f3eda585d12df732e38ae (patch) | |
| tree | 2752d2ee3560db6ce23a8dc572d59fdcdbdb6fce /animism-align/frontend/views | |
| parent | e2e27ed91b8ed8a024223ad03be9d2566750e880 (diff) | |
properly sort media
Diffstat (limited to 'animism-align/frontend/views')
5 files changed, 15 insertions, 2 deletions
diff --git a/animism-align/frontend/views/align/align.util.js b/animism-align/frontend/views/align/align.util.js index c99ff3b..37d4181 100644 --- a/animism-align/frontend/views/align/align.util.js +++ b/animism-align/frontend/views/align/align.util.js @@ -61,4 +61,5 @@ export const cutFirstSentence = text => { export const thumbnailURL = data => { if (data.type === 'video') return data.settings.video.thumbnail_url + if (data.type === 'image') return data.settings.thumbnail.url } diff --git a/animism-align/frontend/views/media/components/media.formImage.js b/animism-align/frontend/views/media/components/media.formImage.js index 23fd7e7..abd0f94 100644 --- a/animism-align/frontend/views/media/components/media.formImage.js +++ b/animism-align/frontend/views/media/components/media.formImage.js @@ -90,6 +90,10 @@ export default class MediaImageForm extends Component { .then(() => { return this.uploadTaggedSize(image, tag, fn) }) + .catch(() => { + console.log('error deleting the image') + return this.uploadTaggedSize(image, tag, fn) + }) } return this.uploadTaggedSize(image, tag, fn) } diff --git a/animism-align/frontend/views/media/containers/media.index.js b/animism-align/frontend/views/media/containers/media.index.js index 19ef4c5..bff781e 100644 --- a/animism-align/frontend/views/media/containers/media.index.js +++ b/animism-align/frontend/views/media/containers/media.index.js @@ -28,7 +28,7 @@ class MediaIndex extends Component { fetch(load_more) { const { options, index } = this.props.media const { order: index_order } = index - const [ sort, order ] = options.sort.split('-') + const [ sort, order ] = options.sort.split(' ') actions.media.index({ sort, order, limit: 5000, // offset: load_more ? index_order.length : 0, }, load_more) diff --git a/animism-align/frontend/views/media/media.css b/animism-align/frontend/views/media/media.css index e6e6f5d..701cf44 100644 --- a/animism-align/frontend/views/media/media.css +++ b/animism-align/frontend/views/media/media.css @@ -4,6 +4,14 @@ overflow: scroll; } +.results .cell { + margin-bottom: 1rem; + margin-right: 1rem; +} +.media .results .meta > div { + max-width: 100%; +} + /* new / edit media forms */ .formContainer { diff --git a/animism-align/frontend/views/media/media.reducer.js b/animism-align/frontend/views/media/media.reducer.js index 6a04b9a..cb9b91d 100644 --- a/animism-align/frontend/views/media/media.reducer.js +++ b/animism-align/frontend/views/media/media.reducer.js @@ -5,7 +5,7 @@ import { crudState, crudReducer } from '../../api/crud.reducer' const initialState = crudState('media', { options: { - sort: 'author-asc', + sort: 'author asc', thumbnailSize: getDefault('upload.thumbnailSize', 'small'), } }) |
