diff --git a/frontend/src/DiscoverMovie/DiscoverMovieFooter.js b/frontend/src/DiscoverMovie/DiscoverMovieFooter.js index cc75157df..487954193 100644 --- a/frontend/src/DiscoverMovie/DiscoverMovieFooter.js +++ b/frontend/src/DiscoverMovie/DiscoverMovieFooter.js @@ -2,6 +2,7 @@ import _ from 'lodash'; import PropTypes from 'prop-types'; import React, { Component } from 'react'; import AvailabilitySelectInput from 'Components/Form/AvailabilitySelectInput'; +import CheckInput from 'Components/Form/CheckInput'; import QualityProfileSelectInputConnector from 'Components/Form/QualityProfileSelectInputConnector'; import RootFolderSelectInputConnector from 'Components/Form/RootFolderSelectInputConnector'; import SelectInput from 'Components/Form/SelectInput'; @@ -25,7 +26,8 @@ class DiscoverMovieFooter extends Component { defaultMonitor, defaultQualityProfileId, defaultMinimumAvailability, - defaultRootFolderPath + defaultRootFolderPath, + defaultSearchForMovie } = props; this.state = { @@ -33,6 +35,7 @@ class DiscoverMovieFooter extends Component { qualityProfileId: defaultQualityProfileId, minimumAvailability: defaultMinimumAvailability, rootFolderPath: defaultRootFolderPath, + searchForMovie: defaultSearchForMovie, isExcludeMovieModalOpen: false, destinationRootFolder: null }; @@ -43,14 +46,16 @@ class DiscoverMovieFooter extends Component { defaultMonitor, defaultQualityProfileId, defaultMinimumAvailability, - defaultRootFolderPath + defaultRootFolderPath, + defaultSearchForMovie } = this.props; const { monitor, qualityProfileId, minimumAvailability, - rootFolderPath + rootFolderPath, + searchForMovie } = this.state; const newState = {}; @@ -71,6 +76,10 @@ class DiscoverMovieFooter extends Component { newState.rootFolderPath = defaultRootFolderPath; } + if (searchForMovie !== defaultSearchForMovie) { + newState.searchForMovie = defaultSearchForMovie; + } + if (!_.isEmpty(newState)) { this.setState(newState); } @@ -79,9 +88,6 @@ class DiscoverMovieFooter extends Component { // // Listeners - // - // Listeners - onExcludeSelectedPress = () => { this.setState({ isExcludeMovieModalOpen: true }); } @@ -95,14 +101,16 @@ class DiscoverMovieFooter extends Component { monitor, qualityProfileId, minimumAvailability, - rootFolderPath + rootFolderPath, + searchForMovie } = this.state; const addOptions = { monitor, qualityProfileId, minimumAvailability, - rootFolderPath + rootFolderPath, + searchForMovie }; this.props.onAddMoviesPress({ addOptions }); @@ -125,6 +133,7 @@ class DiscoverMovieFooter extends Component { qualityProfileId, minimumAvailability, rootFolderPath, + searchForMovie, isExcludeMovieModalOpen } = this.state; @@ -193,6 +202,20 @@ class DiscoverMovieFooter extends Component { /> +
+ + + +
+
{translate('AddMovies')} -
- - {translate('AddExclusion')} - + + {translate('AddExclusion')} + +
@@ -245,6 +268,7 @@ DiscoverMovieFooter.propTypes = { defaultQualityProfileId: PropTypes.number, defaultMinimumAvailability: PropTypes.string, defaultRootFolderPath: PropTypes.string, + defaultSearchForMovie: PropTypes.bool, onInputChange: PropTypes.func.isRequired, onAddMoviesPress: PropTypes.func.isRequired, onExcludeMoviesPress: PropTypes.func.isRequired diff --git a/frontend/src/DiscoverMovie/DiscoverMovieFooterConnector.js b/frontend/src/DiscoverMovie/DiscoverMovieFooterConnector.js index aa5148d93..604eff4bf 100644 --- a/frontend/src/DiscoverMovie/DiscoverMovieFooterConnector.js +++ b/frontend/src/DiscoverMovie/DiscoverMovieFooterConnector.js @@ -15,7 +15,8 @@ function createMapStateToProps() { monitor: defaultMonitor, qualityProfileId: defaultQualityProfileId, minimumAvailability: defaultMinimumAvailability, - rootFolderPath: defaultRootFolderPath + rootFolderPath: defaultRootFolderPath, + searchForMovie: defaultSearchForMovie } = discoverMovie.defaults; const { @@ -33,7 +34,8 @@ function createMapStateToProps() { defaultMonitor, defaultQualityProfileId, defaultMinimumAvailability, - defaultRootFolderPath + defaultRootFolderPath, + defaultSearchForMovie }; } ); diff --git a/frontend/src/Store/Actions/discoverMovieActions.js b/frontend/src/Store/Actions/discoverMovieActions.js index 8ca78965b..9cc9bd6d8 100644 --- a/frontend/src/Store/Actions/discoverMovieActions.js +++ b/frontend/src/Store/Actions/discoverMovieActions.js @@ -45,7 +45,8 @@ export const defaultState = { monitor: 'true', qualityProfileId: 0, minimumAvailability: 'announced', - tags: [] + tags: [], + searchForMovie: false }, posterOptions: {