tedkulp/Radarr
1
0
Fork 0
mirror of https://github.com/Radarr/Radarr.git synced 2026-04-15 21:05:48 -04:00
Code Issues Projects Releases Wiki Activity

Fixed: Manual Import not automatically choosing right movie.

Browse Source 
Fixes #2458, Fixes #2061
Generally improved Manual Import UI
This commit is contained in:
Leonardo Galli
2018-02-02 14:51:18 +01:00
parent 54e57bf16a
commit 5f8aeeac17
6 changed files with 29 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/UI/.idea/runConfigurations/Debug___Chrome.xml generated
View File

@@ -1,17 +1,17 @@
<component name="ProjectRunConfigurationManager">
<configuration default="false" name="Debug - Chrome" type="JavascriptDebugType" factoryName="JavaScript Debug" singleton="true" engineId="98ca6316-2f89-46d9-a9e5-fa9e2b0625b3" uri="http://localhost:7878">
<mapping url="http://localhost:8989/Wanted" local-file="$PROJECT_DIR$/Wanted" />
<mapping url="http://localhost:8989/Config.js" local-file="$PROJECT_DIR$/Config.js" />
<mapping url="http://localhost:8989" local-file="$PROJECT_DIR$" />
<mapping url="http://localhost:8989/Wanted" local-file="$PROJECT_DIR$/Wanted" />
<mapping url="http://localhost:8989/app.js" local-file="$PROJECT_DIR$/app.js" />
<mapping url="http://localhost:8989/Mixins" local-file="$PROJECT_DIR$/Mixins" />
<mapping url="http://localhost:8989/Quality" local-file="$PROJECT_DIR$/Quality" />
<mapping url="http://localhost:8989/Shared" local-file="$PROJECT_DIR$/Shared" />
<mapping url="http://localhost:8989/Controller.js" local-file="$PROJECT_DIR$/Controller.js" />
<mapping url="http://localhost:8989/Calendar" local-file="$PROJECT_DIR$/Calendar" />
<mapping url="http://localhost:8989/Controller.js" local-file="$PROJECT_DIR$/Controller.js" />
<mapping url="http://localhost:8989/Series" local-file="$PROJECT_DIR$/Series" />
<mapping url="http://localhost:8989/AddSeries" local-file="$PROJECT_DIR$/AddSeries" />
<mapping url="http://localhost:8989/Settings" local-file="$PROJECT_DIR$/Settings" />
<mapping url="http://localhost:8989/Config.js" local-file="$PROJECT_DIR$/Config.js" />
<RunnerSettings RunnerId="JavascriptDebugRunner" />
<ConfigurationWrapper RunnerId="JavascriptDebugRunner" />
<method />

4
src/UI/ManualImport/ManualImportCollection.js
View File

@@ -36,7 +36,7 @@ var Collection = PageableCollection.extend({
},
sortMappings : {
series : {
movie : {
sortValue : function(model, attr, order) {
var series = model.get(attr);
@@ -71,4 +71,4 @@ var Collection = PageableCollection.extend({
Collection = AsSortedCollection.call(Collection);
module.exports = Collection;
module.exports = Collection;

10
src/UI/ManualImport/ManualImportRow.js
View File

@@ -22,9 +22,7 @@ module.exports = Backgrid.Row.extend({
},
_setError : function () {
if (this.model.has('series') &&
this.model.has('seasonNumber') &&
(this.model.has('episodes') && this.model.get('episodes').length > 0)&&
if (this.model.has('movie') &&
this.model.has('quality')) {
this.$el.removeClass('manual-import-error');
}
@@ -35,7 +33,7 @@ module.exports = Backgrid.Row.extend({
},
_setClasses : function () {
this.$el.toggleClass('has-series', this.model.has('series'));
this.$el.toggleClass('has-season', this.model.has('seasonNumber'));
this.$el.toggleClass('has-movie', this.model.has('movie'));
//this.$el.toggleClass('has-season', this.model.has('seasonNumber'));
}
});
});

4
src/UI/ManualImport/Movie/SelectMovieLayout.js
View File

@@ -87,8 +87,8 @@ module.exports = Marionette.Layout.extend({
_filter : function (term) {
this.movieCollection.reset(this.fullMovieCollection.filter(function(model){
return model.get("title").toLowerCase().indexOf(term.toLowerCase()) != -1;
}).slice(0, 20));
return (model.get("title") + " ("+model.get("year")+")").toLowerCase().indexOf(term.toLowerCase()) != -1;
}).slice(0, 50));
this._setModelCollection();
//this.movieView.render();