Mirrors/Radarr
1
0
Fork 0
mirror of https://github.com/Radarr/Radarr.git synced 2024-11-19 17:32:38 +01:00
Code Issues Releases Wiki Activity

New: Display excluded label for movies in collections

Browse Source
This commit is contained in:
Bogdan 2024-05-06 23:19:15 +03:00
parent 1090aeff75
commit dff85dc1f3
4 changed files with 28 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
frontend/src/Collection/Overview/CollectionMovie.css
View File

@ -115,3 +115,16 @@ $hoverScale: 1.05;
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);
}

1
frontend/src/Collection/Overview/CollectionMovie.css.d.ts vendored
View File

@ -6,6 +6,7 @@ interface CssExports {
'content': string;
'controls': string;
'editorSelect': string;
'excluded': string;
'externalLinks': string;
'link': string;
'monitorToggleButton': string;

12
frontend/src/Collection/Overview/CollectionMovie.js
View File

@ -5,6 +5,7 @@ import MonitorToggleButton from 'Components/MonitorToggleButton';
import EditMovieModalConnector from 'Movie/Edit/EditMovieModalConnector';
import MovieIndexProgressBar from 'Movie/Index/ProgressBar/MovieIndexProgressBar';
import MoviePoster from 'Movie/MoviePoster';
import translate from 'Utilities/String/translate';
import AddNewCollectionMovieModal from './../AddNewCollectionMovieModal';
import styles from './CollectionMovie.css';
@ -72,6 +73,7 @@ class CollectionMovie extends Component {
isAvailable,
movieFile,
isExistingMovie,
isExcluded,
posterWidth,
posterHeight,
detailedProgressBar,
@ -107,6 +109,15 @@ class CollectionMovie extends Component {
</div>
}
{
isExcluded ?
<div
className={styles.excluded}
title={translate('Excluded')}
/> :
null
}
<Link
className={styles.link}
style={elementStyle}
@ -189,6 +200,7 @@ CollectionMovie.propTypes = {
posterHeight: PropTypes.number.isRequired,
detailedProgressBar: PropTypes.bool.isRequired,
isExistingMovie: PropTypes.bool,
isExcluded: PropTypes.bool,
tmdbId: PropTypes.number.isRequired,
imdbId: PropTypes.string,
youTubeTrailerId: PropTypes.string,

2
src/Radarr.Api.V3/Collections/CollectionController.cs
View File

@ -182,6 +182,7 @@ private IEnumerable<CollectionResource> MapToResource(List<MovieCollection> coll
movieResource.Folder = _fileNameBuilder.GetMovieFolder(new Movie { MovieMetadata = movie }, namingConfig);
var isExcluded = listExclusions.Any(e => e.TmdbId == movie.TmdbId);
movieResource.IsExcluded = 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);
var isExcluded = listExclusions.Any(e => e.TmdbId == movie.TmdbId);
movieResource.IsExcluded = isExcluded;
if (!existingMoviesTmdbIds.Contains(movie.TmdbId) && !isExcluded)
{