Merge pull request #1106 from geogolem/filtersHotFix

this needs to match with the property forclient mode
pull/1107/head
geogolem 7 years ago committed by GitHub
commit db6e91cd95

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

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

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

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

Loading…
Cancel
Save