mirror of
https://github.com/Radarr/Radarr.git
synced 2024-10-05 15:47:20 +02:00
New: Don't default manual import to move
Closes #7280 Closes #7309 (cherry picked from commit 0d739cd26d3b18d1456444e9ddf7e71d84e40253)
This commit is contained in:
parent
79cd2b2346
commit
006c9289de
@ -81,6 +81,7 @@ const filterExistingFilesOptions = {
|
|||||||
};
|
};
|
||||||
|
|
||||||
const importModeOptions = [
|
const importModeOptions = [
|
||||||
|
{ key: 'chooseImportMode', value: translate('ChooseImportMode'), disabled: true },
|
||||||
{ key: 'move', value: translate('MoveFiles') },
|
{ key: 'move', value: translate('MoveFiles') },
|
||||||
{ key: 'copy', value: translate('HardlinkCopyFiles') }
|
{ key: 'copy', value: translate('HardlinkCopyFiles') }
|
||||||
];
|
];
|
||||||
|
@ -1,4 +1,3 @@
|
|||||||
import _ from 'lodash';
|
|
||||||
import PropTypes from 'prop-types';
|
import PropTypes from 'prop-types';
|
||||||
import React, { Component } from 'react';
|
import React, { Component } from 'react';
|
||||||
import { connect } from 'react-redux';
|
import { connect } from 'react-redux';
|
||||||
@ -101,9 +100,18 @@ class InteractiveImportModalContentConnector extends Component {
|
|||||||
};
|
};
|
||||||
|
|
||||||
onImportSelectedPress = (selected, importMode) => {
|
onImportSelectedPress = (selected, importMode) => {
|
||||||
|
const {
|
||||||
|
items
|
||||||
|
} = this.props;
|
||||||
|
|
||||||
const files = [];
|
const files = [];
|
||||||
|
|
||||||
_.forEach(this.props.items, (item) => {
|
if (importMode === 'chooseImportMode') {
|
||||||
|
this.setState({ interactiveImportErrorMessage: 'An import mode must be selected' });
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
items.forEach((item) => {
|
||||||
const isSelected = selected.indexOf(item.id) > -1;
|
const isSelected = selected.indexOf(item.id) > -1;
|
||||||
|
|
||||||
if (isSelected) {
|
if (isSelected) {
|
||||||
|
@ -30,7 +30,7 @@ export const defaultState = {
|
|||||||
sortKey: 'quality',
|
sortKey: 'quality',
|
||||||
sortDirection: sortDirections.DESCENDING,
|
sortDirection: sortDirections.DESCENDING,
|
||||||
recentFolders: [],
|
recentFolders: [],
|
||||||
importMode: 'move',
|
importMode: 'chooseImportMode',
|
||||||
sortPredicates: {
|
sortPredicates: {
|
||||||
relativePath: function(item, direction) {
|
relativePath: function(item, direction) {
|
||||||
const relativePath = item.relativePath;
|
const relativePath = item.relativePath;
|
||||||
|
File diff suppressed because it is too large
Load Diff
Loading…
Reference in New Issue
Block a user