mirror of
https://github.com/Radarr/Radarr.git
synced 2024-10-02 14:17:19 +02:00
New: Display excluded label for movies in collections
This commit is contained in:
parent
1090aeff75
commit
dff85dc1f3
@ -115,3 +115,16 @@ $hoverScale: 1.05;
|
|||||||
color: var(--iconButtonHoverLightColor);
|
color: var(--iconButtonHoverLightColor);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.excluded {
|
||||||
|
position: absolute;
|
||||||
|
top: 0;
|
||||||
|
right: 0;
|
||||||
|
z-index: 1;
|
||||||
|
width: 0;
|
||||||
|
height: 0;
|
||||||
|
border-width: 0 25px 25px 0;
|
||||||
|
border-style: solid;
|
||||||
|
border-color: transparent var(--dangerColor) transparent transparent;
|
||||||
|
color: var(--white);
|
||||||
|
}
|
||||||
|
@ -6,6 +6,7 @@ interface CssExports {
|
|||||||
'content': string;
|
'content': string;
|
||||||
'controls': string;
|
'controls': string;
|
||||||
'editorSelect': string;
|
'editorSelect': string;
|
||||||
|
'excluded': string;
|
||||||
'externalLinks': string;
|
'externalLinks': string;
|
||||||
'link': string;
|
'link': string;
|
||||||
'monitorToggleButton': string;
|
'monitorToggleButton': string;
|
||||||
|
@ -5,6 +5,7 @@ import MonitorToggleButton from 'Components/MonitorToggleButton';
|
|||||||
import EditMovieModalConnector from 'Movie/Edit/EditMovieModalConnector';
|
import EditMovieModalConnector from 'Movie/Edit/EditMovieModalConnector';
|
||||||
import MovieIndexProgressBar from 'Movie/Index/ProgressBar/MovieIndexProgressBar';
|
import MovieIndexProgressBar from 'Movie/Index/ProgressBar/MovieIndexProgressBar';
|
||||||
import MoviePoster from 'Movie/MoviePoster';
|
import MoviePoster from 'Movie/MoviePoster';
|
||||||
|
import translate from 'Utilities/String/translate';
|
||||||
import AddNewCollectionMovieModal from './../AddNewCollectionMovieModal';
|
import AddNewCollectionMovieModal from './../AddNewCollectionMovieModal';
|
||||||
import styles from './CollectionMovie.css';
|
import styles from './CollectionMovie.css';
|
||||||
|
|
||||||
@ -72,6 +73,7 @@ class CollectionMovie extends Component {
|
|||||||
isAvailable,
|
isAvailable,
|
||||||
movieFile,
|
movieFile,
|
||||||
isExistingMovie,
|
isExistingMovie,
|
||||||
|
isExcluded,
|
||||||
posterWidth,
|
posterWidth,
|
||||||
posterHeight,
|
posterHeight,
|
||||||
detailedProgressBar,
|
detailedProgressBar,
|
||||||
@ -107,6 +109,15 @@ class CollectionMovie extends Component {
|
|||||||
</div>
|
</div>
|
||||||
}
|
}
|
||||||
|
|
||||||
|
{
|
||||||
|
isExcluded ?
|
||||||
|
<div
|
||||||
|
className={styles.excluded}
|
||||||
|
title={translate('Excluded')}
|
||||||
|
/> :
|
||||||
|
null
|
||||||
|
}
|
||||||
|
|
||||||
<Link
|
<Link
|
||||||
className={styles.link}
|
className={styles.link}
|
||||||
style={elementStyle}
|
style={elementStyle}
|
||||||
@ -189,6 +200,7 @@ CollectionMovie.propTypes = {
|
|||||||
posterHeight: PropTypes.number.isRequired,
|
posterHeight: PropTypes.number.isRequired,
|
||||||
detailedProgressBar: PropTypes.bool.isRequired,
|
detailedProgressBar: PropTypes.bool.isRequired,
|
||||||
isExistingMovie: PropTypes.bool,
|
isExistingMovie: PropTypes.bool,
|
||||||
|
isExcluded: PropTypes.bool,
|
||||||
tmdbId: PropTypes.number.isRequired,
|
tmdbId: PropTypes.number.isRequired,
|
||||||
imdbId: PropTypes.string,
|
imdbId: PropTypes.string,
|
||||||
youTubeTrailerId: PropTypes.string,
|
youTubeTrailerId: PropTypes.string,
|
||||||
|
@ -182,6 +182,7 @@ private IEnumerable<CollectionResource> MapToResource(List<MovieCollection> coll
|
|||||||
movieResource.Folder = _fileNameBuilder.GetMovieFolder(new Movie { MovieMetadata = movie }, namingConfig);
|
movieResource.Folder = _fileNameBuilder.GetMovieFolder(new Movie { MovieMetadata = movie }, namingConfig);
|
||||||
|
|
||||||
var isExcluded = listExclusions.Any(e => e.TmdbId == movie.TmdbId);
|
var isExcluded = listExclusions.Any(e => e.TmdbId == movie.TmdbId);
|
||||||
|
movieResource.IsExcluded = isExcluded;
|
||||||
|
|
||||||
if (!existingMoviesTmdbIds.Contains(movie.TmdbId) && !isExcluded)
|
if (!existingMoviesTmdbIds.Contains(movie.TmdbId) && !isExcluded)
|
||||||
{
|
{
|
||||||
@ -215,6 +216,7 @@ private CollectionResource MapToResource(MovieCollection collection)
|
|||||||
movieResource.Folder = _fileNameBuilder.GetMovieFolder(new Movie { MovieMetadata = movie }, namingConfig);
|
movieResource.Folder = _fileNameBuilder.GetMovieFolder(new Movie { MovieMetadata = movie }, namingConfig);
|
||||||
|
|
||||||
var isExcluded = listExclusions.Any(e => e.TmdbId == movie.TmdbId);
|
var isExcluded = listExclusions.Any(e => e.TmdbId == movie.TmdbId);
|
||||||
|
movieResource.IsExcluded = isExcluded;
|
||||||
|
|
||||||
if (!existingMoviesTmdbIds.Contains(movie.TmdbId) && !isExcluded)
|
if (!existingMoviesTmdbIds.Contains(movie.TmdbId) && !isExcluded)
|
||||||
{
|
{
|
||||||
|
Loading…
Reference in New Issue
Block a user