github/lidarr
1
0
Fork 0
mirror of https://github.com/lidarr/lidarr.git synced 2025-07-15 17:43:49 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Fixed: Don't use "Ended" for people

Browse source 
Fixes #798
This commit is contained in:
Qstick 2019-05-09 19:46:38 -04:00
parent b2d87cccb2
commit 4a8d01f33e
5 changed files with 16 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
frontend/src/AddArtist/AddNewArtist/AddNewArtistSearchResult.js
View file

@ -83,6 +83,8 @@ class AddNewArtistSearchResult extends Component {
const linkProps = isExistingArtist ? { to: `/artist/${foreignArtistId}` } : { onPress: this.onPress };
const endedString = artistType === 'Person' ? 'Deceased' : 'Ended';
const height = calculateHeight(230, isSmallScreen);
return (
@ -153,7 +155,7 @@ class AddNewArtistSearchResult extends Component {
kind={kinds.DANGER}
size={sizes.LARGE}
>
Ended
{endedString}
</Label> :
null
}

5
frontend/src/Artist/Details/ArtistDetails.js
View file

@ -191,6 +191,7 @@ class ArtistDetails extends Component {
overview,
links,
images,
artistType,
alternateTitles,
tags,
isSaving,
@ -230,6 +231,7 @@ class ArtistDetails extends Component {
} = this.state;
const continuing = status === 'continuing';
const endedString = artistType === 'Person' ? 'Deceased' : 'Ended';
let trackFilesCountMessage = 'No track files';
@ -504,7 +506,7 @@ class ArtistDetails extends Component {
/>
<span className={styles.qualityProfileName}>
{continuing ? 'Continuing' : 'Ended'}
{continuing ? 'Continuing' : endedString}
</span>
</Label>
@ -678,6 +680,7 @@ ArtistDetails.propTypes = {
statistics: PropTypes.object.isRequired,
qualityProfileId: PropTypes.number.isRequired,
monitored: PropTypes.bool.isRequired,
artistType: PropTypes.string.isRequired,
albumTypes: PropTypes.arrayOf(PropTypes.string),
status: PropTypes.string.isRequired,
overview: PropTypes.string.isRequired,

3
frontend/src/Artist/Editor/ArtistEditorRow.js
View file

@ -29,6 +29,7 @@ class ArtistEditorRow extends Component {
status,
foreignArtistId,
artistName,
artistType,
monitored,
languageProfile,
metadataProfile,
@ -50,6 +51,7 @@ class ArtistEditorRow extends Component {
/>
<ArtistStatusCell
artistType={artistType}
monitored={monitored}
status={status}
/>
@ -107,6 +109,7 @@ ArtistEditorRow.propTypes = {
status: PropTypes.string.isRequired,
foreignArtistId: PropTypes.string.isRequired,
artistName: PropTypes.string.isRequired,
artistType: PropTypes.string.isRequired,
monitored: PropTypes.bool.isRequired,
languageProfile: PropTypes.object.isRequired,
metadataProfile: PropTypes.object.isRequired,

1
frontend/src/Artist/Index/Table/ArtistIndexRow.js
View file

@ -139,6 +139,7 @@ class ArtistIndexRow extends Component {
<ArtistStatusCell
key={name}
className={styles[name]}
artistType={artistType}
monitored={monitored}
status={status}
component={VirtualTableRowCell}

6
frontend/src/Artist/Index/Table/ArtistStatusCell.js
View file

@ -8,12 +8,15 @@ import styles from './ArtistStatusCell.css';
function ArtistStatusCell(props) {
const {
className,
artistType,
monitored,
status,
component: Component,
...otherProps
} = props;
const endedString = artistType === 'Person' ? 'Deceased' : 'Ended';
return (
<Component
className={className}
@ -28,7 +31,7 @@ function ArtistStatusCell(props) {
<Icon
className={styles.statusIcon}
name={status === 'ended' ? icons.ARTIST_ENDED : icons.ARTIST_CONTINUING}
title={status === 'ended' ? 'Ended' : 'Continuing'}
title={status === 'ended' ? endedString : 'Continuing'}
/>
</Component>
);
@ -36,6 +39,7 @@ function ArtistStatusCell(props) {
ArtistStatusCell.propTypes = {
className: PropTypes.string.isRequired,
artistType: PropTypes.string.isRequired,
monitored: PropTypes.bool.isRequired,
status: PropTypes.string.isRequired,
component: PropTypes.func