mirror of https://github.com/Radarr/Radarr
Fixed: Selection of last added custom filter
Plus some translations and typos
This commit is contained in:
parent
94287d9427
commit
7e4231fc0e
|
@ -1,3 +1,4 @@
|
||||||
|
import { maxBy } from 'lodash';
|
||||||
import PropTypes from 'prop-types';
|
import PropTypes from 'prop-types';
|
||||||
import React, { Component } from 'react';
|
import React, { Component } from 'react';
|
||||||
import FormInputGroup from 'Components/Form/FormInputGroup';
|
import FormInputGroup from 'Components/Form/FormInputGroup';
|
||||||
|
@ -50,7 +51,7 @@ class FilterBuilderModalContent extends Component {
|
||||||
if (id) {
|
if (id) {
|
||||||
dispatchSetFilter({ selectedFilterKey: id });
|
dispatchSetFilter({ selectedFilterKey: id });
|
||||||
} else {
|
} else {
|
||||||
const last = customFilters[customFilters.length -1];
|
const last = maxBy(customFilters, 'id');
|
||||||
dispatchSetFilter({ selectedFilterKey: last.id });
|
dispatchSetFilter({ selectedFilterKey: last.id });
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -108,7 +109,7 @@ class FilterBuilderModalContent extends Component {
|
||||||
this.setState({
|
this.setState({
|
||||||
labelErrors: [
|
labelErrors: [
|
||||||
{
|
{
|
||||||
message: 'Label is required'
|
message: translate('LabelIsRequired')
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
});
|
});
|
||||||
|
@ -146,13 +147,13 @@ class FilterBuilderModalContent extends Component {
|
||||||
return (
|
return (
|
||||||
<ModalContent onModalClose={onModalClose}>
|
<ModalContent onModalClose={onModalClose}>
|
||||||
<ModalHeader>
|
<ModalHeader>
|
||||||
Custom Filter
|
{translate('CustomFilter')}
|
||||||
</ModalHeader>
|
</ModalHeader>
|
||||||
|
|
||||||
<ModalBody>
|
<ModalBody>
|
||||||
<div className={styles.labelContainer}>
|
<div className={styles.labelContainer}>
|
||||||
<div className={styles.label}>
|
<div className={styles.label}>
|
||||||
Label
|
{translate('Label')}
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div className={styles.labelInputContainer}>
|
<div className={styles.labelInputContainer}>
|
||||||
|
@ -166,9 +167,7 @@ class FilterBuilderModalContent extends Component {
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div className={styles.label}>
|
<div className={styles.label}>{translate('Filters')}</div>
|
||||||
{translate('Filters')}
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div className={styles.rows}>
|
<div className={styles.rows}>
|
||||||
{
|
{
|
||||||
|
|
|
@ -37,8 +37,8 @@ class CustomFilter extends Component {
|
||||||
dispatchSetFilter
|
dispatchSetFilter
|
||||||
} = this.props;
|
} = this.props;
|
||||||
|
|
||||||
// Assume that delete and then unmounting means the delete was successful.
|
// Assume that delete and then unmounting means the deletion was successful.
|
||||||
// Moving this check to a ancestor would be more accurate, but would have
|
// Moving this check to an ancestor would be more accurate, but would have
|
||||||
// more boilerplate.
|
// more boilerplate.
|
||||||
if (this.state.isDeleting && id === selectedFilterKey) {
|
if (this.state.isDeleting && id === selectedFilterKey) {
|
||||||
dispatchSetFilter({ selectedFilterKey: 'all' });
|
dispatchSetFilter({ selectedFilterKey: 'all' });
|
||||||
|
|
|
@ -245,6 +245,7 @@
|
||||||
"Crew": "Crew",
|
"Crew": "Crew",
|
||||||
"CurrentlyInstalled": "Currently Installed",
|
"CurrentlyInstalled": "Currently Installed",
|
||||||
"Custom": "Custom",
|
"Custom": "Custom",
|
||||||
|
"CustomFilter": "Custom Filter",
|
||||||
"CustomFilters": "Custom Filters",
|
"CustomFilters": "Custom Filters",
|
||||||
"CustomFormat": "Custom Format",
|
"CustomFormat": "Custom Format",
|
||||||
"CustomFormatHelpText": "{appName} scores each release using the sum of scores for matching custom formats. If a new release would improve the score, at the same or better quality, then {appName} will grab it.",
|
"CustomFormatHelpText": "{appName} scores each release using the sum of scores for matching custom formats. If a new release would improve the score, at the same or better quality, then {appName} will grab it.",
|
||||||
|
@ -767,6 +768,8 @@
|
||||||
"InvalidUILanguage": "Your UI is set to an invalid language, correct it and save your settings",
|
"InvalidUILanguage": "Your UI is set to an invalid language, correct it and save your settings",
|
||||||
"KeepAndUnmonitorMovie": "Keep and Unmonitor Movie",
|
"KeepAndUnmonitorMovie": "Keep and Unmonitor Movie",
|
||||||
"KeyboardShortcuts": "Keyboard Shortcuts",
|
"KeyboardShortcuts": "Keyboard Shortcuts",
|
||||||
|
"Label": "Label",
|
||||||
|
"LabelIsRequired": "Label is required",
|
||||||
"Language": "Language",
|
"Language": "Language",
|
||||||
"LanguageHelpText": "Language for Releases",
|
"LanguageHelpText": "Language for Releases",
|
||||||
"Languages": "Languages",
|
"Languages": "Languages",
|
||||||
|
|
Loading…
Reference in New Issue