mirror/Radarr
1
0
Fork 0
mirror of https://github.com/Radarr/Radarr synced 2024-12-31 20:35:37 +00:00
Code Issues Releases Wiki Activity

Fixed: Digital before Physical for normal release order

Browse source
This commit is contained in:
Qstick 2020-07-08 09:28:42 -04:00
parent 74539d2025
commit d791f3f67f
3 changed files with 26 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
frontend/src/Movie/Details/MovieReleaseDates.js
View file

@ -28,18 +28,6 @@ function MovieReleaseDates(props) {
{getRelativeDate(inCinemas, shortDateFormat, showRelativeDates, { timeFormat, timeForToday: false })}
</div>
}
{
!!physicalRelease &&
<div >
<span className={styles.dateIcon}>
<Icon
name={icons.DISC}
/>
</span>
{getRelativeDate(physicalRelease, shortDateFormat, showRelativeDates, { timeFormat, timeForToday: false })}
</div>
}
{
!!digitalRelease &&
<div >
@ -51,6 +39,17 @@ function MovieReleaseDates(props) {
{getRelativeDate(digitalRelease, shortDateFormat, showRelativeDates, { timeFormat, timeForToday: false })}
</div>
}
{
!!physicalRelease &&
<div >
<span className={styles.dateIcon}>
<Icon
name={icons.DISC}
/>
</span>
{getRelativeDate(physicalRelease, shortDateFormat, showRelativeDates, { timeFormat, timeForToday: false })}
</div>
}
</div>
);
}

22
frontend/src/Movie/Index/Table/MovieIndexRow.js
View file

@ -215,17 +215,6 @@ class MovieIndexRow extends Component {
);
}
if (name === 'physicalRelease') {
return (
<RelativeDateCellConnector
key={name}
className={styles[name]}
date={physicalRelease}
component={VirtualTableRowCell}
/>
);
}
if (name === 'digitalRelease') {
return (
<RelativeDateCellConnector
@ -237,6 +226,17 @@ class MovieIndexRow extends Component {
);
}
if (name === 'physicalRelease') {
return (
<RelativeDateCellConnector
key={name}
className={styles[name]}
date={physicalRelease}
component={VirtualTableRowCell}
/>
);
}
if (name === 'runtime') {
return (
<VirtualTableRowCell

8
frontend/src/Store/Actions/movieIndexActions.js
View file

@ -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
},