github/lidarr
1
0
Fork 0
mirror of https://github.com/lidarr/lidarr.git synced 2025-08-23 06:45:19 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #1106 from geogolem/filtersHotFix

Browse source 
this needs to match with the property forclient mode
This commit is contained in:
geogolem 2017-03-10 01:45:07 -05:00 • committed by GitHub
commit db6e91cd95
4 changed files with 23 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/NzbDrone.Core/Tv/MovieService.cs
View file

@ -75,15 +75,15 @@ namespace NzbDrone.Core.Tv
//{ //{
// return v => v.Monitored == true || v.Monitored == false; // return v => v.Monitored == true || v.Monitored == false;
//} //}
if (FilterKey == "moviemonitored" && FilterValue == "false") if (FilterKey == "monitored" && FilterValue == "false")
{ {
return v => v.Monitored == false; return v => v.Monitored == false;
} }
else if (FilterKey == "moviemonitored" && FilterValue == "true") else if (FilterKey == "monitored" && FilterValue == "true")
{ {
return v => v.Monitored == true; return v => v.Monitored == true;
} }
else if (FilterKey == "moviestatus") else if (FilterKey == "status")
{ {
switch (FilterValue) switch (FilterValue)
{ {
@ -105,7 +105,7 @@ namespace NzbDrone.Core.Tv
break; break;
} }
} }
else if (FilterKey == "moviedownloaded") else if (FilterKey == "downloaded")
{ {
return v => v.MovieFileId == 0; return v => v.MovieFileId == 0;
} }

14
src/UI/Movies/MoviesCollection.js
View file

@ -19,33 +19,33 @@ var filterModes = {
null null
], ],
'continuing' : [ 'continuing' : [
'moviestatus', 'status',
'continuing' 'continuing'
], ],
'ended' : [ 'ended' : [
'moviestatus', 'status',
'ended' 'ended'
], ],
'monitored' : [ 'monitored' : [
'moviemonitored', 'monitored',
true true
], ],
'missing' : [ 'missing' : [
'moviedownloaded', 'downloaded',
false false
], ],
'released' : [ 'released' : [
"moviestatus", "status",
"released", "released",
//function(model) { return model.getStatus() == "released"; } //function(model) { return model.getStatus() == "released"; }
], ],
'announced' : [ 'announced' : [
"moviestatus", "status",
"announced", "announced",
//function(model) { return model.getStatus() == "announced"; } //function(model) { return model.getStatus() == "announced"; }
], ],
'cinemas' : [ 'cinemas' : [
"moviestatus", "status",
"inCinemas", "inCinemas",
//function(model) { return model.getStatus() == "inCinemas"; } //function(model) { return model.getStatus() == "inCinemas"; }
] ]

12
src/UI/Wanted/Cutoff/CutoffUnmetCollection.js
View file

@ -31,27 +31,27 @@ var Collection = PagableCollection.extend({
filterModes : { filterModes : {
'monitored' : [ 'monitored' : [
'moviemonitored', 'monitored',
'true' 'true'
], ],
'unmonitored' : [ 'unmonitored' : [
'moviemonitored', 'monitored',
'false' 'false'
], ],
'announced' : [ 'announced' : [
'moviestatus', 'status',
'announced' 'announced'
], ],
'incinemas' : [ 'incinemas' : [
'moviestatus', 'status',
'inCinemas' 'inCinemas'
], ],
'released' : [ 'released' : [
'moviestatus', 'status',
'released' 'released'
], ],
'available' : [ 'available' : [
'moviestatus', 'status',
'available' 'available'
], ],
'all' : [ 'all' : [

12
src/UI/Wanted/Missing/MissingCollection.js
View file

@ -30,27 +30,27 @@ var Collection = PagableCollection.extend({
filterModes : { filterModes : {
'monitored' : [ 'monitored' : [
'moviemonitored', 'monitored',
'true' 'true'
], ],
'unmonitored' : [ 'unmonitored' : [
'moviemonitored', 'monitored',
'false' 'false'
], ],
'announced' : [ 'announced' : [
'moviestatus', 'status',
'announced' 'announced'
], ],
'incinemas' : [ 'incinemas' : [
'moviestatus', 'status',
'inCinemas' 'inCinemas'
], ],
'released' : [ 'released' : [
'moviestatus', 'status',
'released' 'released'
], ],
'available' : [ 'available' : [
'moviestatus', 'status',
'available' 'available'
], ],
'all' : [ 'all' : [