diff --git a/frontend/src/Movie/Index/Posters/MovieIndexPoster.js b/frontend/src/Movie/Index/Posters/MovieIndexPoster.js index d3f92e28c..9cd27b1fb 100644 --- a/frontend/src/Movie/Index/Posters/MovieIndexPoster.js +++ b/frontend/src/Movie/Index/Posters/MovieIndexPoster.js @@ -103,6 +103,7 @@ class MovieIndexPoster extends Component { showRelativeDates, shortDateFormat, showReleaseDate, + showCinemaRelease, inCinemas, physicalRelease, digitalRelease, @@ -133,17 +134,13 @@ class MovieIndexPoster extends Component { }; let releaseDate = ''; - if (showReleaseDate) { - releaseDate = inCinemas; - if (!inCinemas) { - if (physicalRelease && digitalRelease) { - releaseDate = (physicalRelease < digitalRelease) ? physicalRelease : digitalRelease; - } else if (physicalRelease && !digitalRelease) { - releaseDate = physicalRelease; - } else if (digitalRelease && !physicalRelease) { - releaseDate = digitalRelease; - } - } + + if (physicalRelease && digitalRelease) { + releaseDate = (physicalRelease < digitalRelease) ? physicalRelease : digitalRelease; + } else if (physicalRelease && !digitalRelease) { + releaseDate = physicalRelease; + } else if (digitalRelease && !physicalRelease) { + releaseDate = digitalRelease; } return ( @@ -272,6 +269,21 @@ class MovieIndexPoster extends Component { } + { + showCinemaRelease && +
+ {getRelativeDate( + inCinemas, + shortDateFormat, + showRelativeDates, + { + timeFormat, + timeForToday: false + } + )} +
+ } + { showReleaseDate &&
@@ -336,6 +348,7 @@ MovieIndexPoster.propTypes = { showSearchAction: PropTypes.bool.isRequired, showRelativeDates: PropTypes.bool.isRequired, shortDateFormat: PropTypes.string.isRequired, + showCinemaRelease: PropTypes.bool.isRequired, showReleaseDate: PropTypes.bool.isRequired, inCinemas: PropTypes.string, physicalRelease: PropTypes.string, diff --git a/frontend/src/Movie/Index/Posters/MovieIndexPosters.js b/frontend/src/Movie/Index/Posters/MovieIndexPosters.js index 2a01a808b..a515bbc5d 100644 --- a/frontend/src/Movie/Index/Posters/MovieIndexPosters.js +++ b/frontend/src/Movie/Index/Posters/MovieIndexPosters.js @@ -212,6 +212,7 @@ class MovieIndexPosters extends Component { showTitle, showMonitored, showQualityProfile, + showCinemaRelease, showReleaseDate } = posterOptions; @@ -242,6 +243,7 @@ class MovieIndexPosters extends Component { showMonitored={showMonitored} showQualityProfile={showQualityProfile} showReleaseDate={showReleaseDate} + showCinemaRelease={showCinemaRelease} showRelativeDates={showRelativeDates} shortDateFormat={shortDateFormat} timeFormat={timeFormat} diff --git a/frontend/src/Movie/Index/Posters/Options/MovieIndexPosterOptionsModalContent.js b/frontend/src/Movie/Index/Posters/Options/MovieIndexPosterOptionsModalContent.js index 0cd81e9b7..a1c2a23b5 100644 --- a/frontend/src/Movie/Index/Posters/Options/MovieIndexPosterOptionsModalContent.js +++ b/frontend/src/Movie/Index/Posters/Options/MovieIndexPosterOptionsModalContent.js @@ -33,6 +33,7 @@ class MovieIndexPosterOptionsModalContent extends Component { showTitle: props.showTitle, showMonitored: props.showMonitored, showQualityProfile: props.showQualityProfile, + showCinemaRelease: props.showCinemaRelease, showReleaseDate: props.showReleaseDate, showSearchAction: props.showSearchAction }; @@ -71,6 +72,10 @@ class MovieIndexPosterOptionsModalContent extends Component { state.showQualityProfile = showQualityProfile; } + if (showCinemaRelease != prevProps.showCinemaRelease) { + state.showCinemaRelease = showCinemaRelease; + } + if (showReleaseDate !== prevProps.showReleaseDate) { state.showReleaseDate = showReleaseDate; } @@ -109,6 +114,7 @@ class MovieIndexPosterOptionsModalContent extends Component { showTitle, showMonitored, showQualityProfile, + showCinemaRelease, showReleaseDate, showSearchAction } = this.state; @@ -181,6 +187,18 @@ class MovieIndexPosterOptionsModalContent extends Component { /> + + {translate('ShowCinemaRelease')} + + + + {translate('ShowReleaseDate')} @@ -225,6 +243,7 @@ MovieIndexPosterOptionsModalContent.propTypes = { showMonitored: PropTypes.bool.isRequired, showQualityProfile: PropTypes.bool.isRequired, detailedProgressBar: PropTypes.bool.isRequired, + showCinemaRelease: PropTypes.bool.isRequired, showReleaseDate: PropTypes.bool.isRequired, showSearchAction: PropTypes.bool.isRequired, onChangePosterOption: PropTypes.func.isRequired,