From d791f3f67f69d8fcf5c6edaf9ad621f626a4e6a5 Mon Sep 17 00:00:00 2001 From: Qstick Date: Wed, 8 Jul 2020 09:28:42 -0400 Subject: [PATCH] Fixed: Digital before Physical for normal release order --- frontend/src/Movie/Details/MovieReleaseDates.js | 13 ++++++------- frontend/src/Movie/Index/Table/MovieIndexRow.js | 8 ++++---- frontend/src/Store/Actions/movieIndexActions.js | 8 ++++---- 3 files changed, 14 insertions(+), 15 deletions(-) diff --git a/frontend/src/Movie/Details/MovieReleaseDates.js b/frontend/src/Movie/Details/MovieReleaseDates.js index 1435ddbf8..d6abd10c7 100644 --- a/frontend/src/Movie/Details/MovieReleaseDates.js +++ b/frontend/src/Movie/Details/MovieReleaseDates.js @@ -29,26 +29,25 @@ function MovieReleaseDates(props) { } { - !!physicalRelease && + !!digitalRelease &&
- {getRelativeDate(physicalRelease, shortDateFormat, showRelativeDates, { timeFormat, timeForToday: false })} + {getRelativeDate(digitalRelease, shortDateFormat, showRelativeDates, { timeFormat, timeForToday: false })}
} - { - !!digitalRelease && + !!physicalRelease &&
- {getRelativeDate(digitalRelease, shortDateFormat, showRelativeDates, { timeFormat, timeForToday: false })} + {getRelativeDate(physicalRelease, shortDateFormat, showRelativeDates, { timeFormat, timeForToday: false })}
} diff --git a/frontend/src/Movie/Index/Table/MovieIndexRow.js b/frontend/src/Movie/Index/Table/MovieIndexRow.js index fee29b285..41d07ca5a 100644 --- a/frontend/src/Movie/Index/Table/MovieIndexRow.js +++ b/frontend/src/Movie/Index/Table/MovieIndexRow.js @@ -215,23 +215,23 @@ class MovieIndexRow extends Component { ); } - if (name === 'physicalRelease') { + if (name === 'digitalRelease') { return ( ); } - if (name === 'digitalRelease') { + if (name === 'physicalRelease') { return ( ); diff --git a/frontend/src/Store/Actions/movieIndexActions.js b/frontend/src/Store/Actions/movieIndexActions.js index a9f235481..b143473de 100644 --- a/frontend/src/Store/Actions/movieIndexActions.js +++ b/frontend/src/Store/Actions/movieIndexActions.js @@ -114,14 +114,14 @@ export const defaultState = { isVisible: false }, { - name: 'physicalRelease', - label: 'Physical Release', + name: 'digitalRelease', + label: 'Digital Release', isSortable: true, isVisible: false }, { - name: 'digitalRelease', - label: 'Digital Release', + name: 'physicalRelease', + label: 'Physical Release', isSortable: true, isVisible: false },