mirror of
https://github.com/Lidarr/Lidarr
synced 2025-12-06 16:33:52 +01:00
Merge ce523d4466 into d8f79c0189
This commit is contained in:
commit
bd29a52005
2 changed files with 8 additions and 6 deletions
|
|
@ -5,7 +5,7 @@ import { connect } from 'react-redux';
|
||||||
import { createSelector } from 'reselect';
|
import { createSelector } from 'reselect';
|
||||||
import shortenList from 'Utilities/String/shortenList';
|
import shortenList from 'Utilities/String/shortenList';
|
||||||
import titleCase from 'Utilities/String/titleCase';
|
import titleCase from 'Utilities/String/titleCase';
|
||||||
import SelectInput from './SelectInput';
|
import EnhancedSelectInput from './EnhancedSelectInput';
|
||||||
|
|
||||||
function createMapStateToProps() {
|
function createMapStateToProps() {
|
||||||
return createSelector(
|
return createSelector(
|
||||||
|
|
@ -29,7 +29,8 @@ function createMapStateToProps() {
|
||||||
`${disambiguation ? ' (' : ''}${titleCase(disambiguation)}${disambiguation ? ')' : ''}` +
|
`${disambiguation ? ' (' : ''}${titleCase(disambiguation)}${disambiguation ? ')' : ''}` +
|
||||||
`, ${mediumCount} med, ${trackCount} tracks` +
|
`, ${mediumCount} med, ${trackCount} tracks` +
|
||||||
`${country && country.length > 0 ? `, ${shortenList(country)}` : ''}` +
|
`${country && country.length > 0 ? `, ${shortenList(country)}` : ''}` +
|
||||||
`${format ? `, [${format}]` : ''}`
|
`${format ? `, [${format}]` : ''}`,
|
||||||
|
hint: `MBID: ${foreignReleaseId.toString().slice(0, 8)}...`
|
||||||
};
|
};
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
@ -64,7 +65,7 @@ class AlbumReleaseSelectInputConnector extends Component {
|
||||||
render() {
|
render() {
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<SelectInput
|
<EnhancedSelectInput
|
||||||
{...this.props}
|
{...this.props}
|
||||||
onChange={this.onChange}
|
onChange={this.onChange}
|
||||||
/>
|
/>
|
||||||
|
|
|
||||||
|
|
@ -1,7 +1,7 @@
|
||||||
import _ from 'lodash';
|
import _ from 'lodash';
|
||||||
import PropTypes from 'prop-types';
|
import PropTypes from 'prop-types';
|
||||||
import React, { Component } from 'react';
|
import React, { Component } from 'react';
|
||||||
import SelectInput from 'Components/Form/SelectInput';
|
import EnhancedSelectInput from 'Components/Form/EnhancedSelectInput';
|
||||||
import TableRowCell from 'Components/Table/Cells/TableRowCell';
|
import TableRowCell from 'Components/Table/Cells/TableRowCell';
|
||||||
import TableRow from 'Components/Table/TableRow';
|
import TableRow from 'Components/Table/TableRow';
|
||||||
import shortenList from 'Utilities/String/shortenList';
|
import shortenList from 'Utilities/String/shortenList';
|
||||||
|
|
@ -55,7 +55,7 @@ class SelectAlbumReleaseRow extends Component {
|
||||||
if (name === 'release') {
|
if (name === 'release') {
|
||||||
return (
|
return (
|
||||||
<TableRowCell key={name}>
|
<TableRowCell key={name}>
|
||||||
<SelectInput
|
<EnhancedSelectInput
|
||||||
name={id.toString()}
|
name={id.toString()}
|
||||||
values={_.map(releases, (r) => ({
|
values={_.map(releases, (r) => ({
|
||||||
key: r.id,
|
key: r.id,
|
||||||
|
|
@ -64,7 +64,8 @@ class SelectAlbumReleaseRow extends Component {
|
||||||
`, ${r.mediumCount} med, ${r.trackCount} tracks` +
|
`, ${r.mediumCount} med, ${r.trackCount} tracks` +
|
||||||
`${r.country.length > 0 ? ', ' : ''}${shortenList(r.country)}` +
|
`${r.country.length > 0 ? ', ' : ''}${shortenList(r.country)}` +
|
||||||
`${r.format ? ', [' : ''}${r.format}${r.format ? ']' : ''}` +
|
`${r.format ? ', [' : ''}${r.format}${r.format ? ']' : ''}` +
|
||||||
`${r.monitored ? ', Monitored' : ''}`
|
`${r.monitored ? ', Monitored' : ''}`,
|
||||||
|
hint: `MBID: ${r.id.toString().slice(0, 8)}...`
|
||||||
}))}
|
}))}
|
||||||
value={matchedReleaseId}
|
value={matchedReleaseId}
|
||||||
onChange={this.onInputChange}
|
onChange={this.onInputChange}
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue