diff --git a/couchpotato/core/plugins/movie/main.py b/couchpotato/core/plugins/movie/main.py index 2df4fa5..6bf3e3f 100644 --- a/couchpotato/core/plugins/movie/main.py +++ b/couchpotato/core/plugins/movie/main.py @@ -5,6 +5,7 @@ from couchpotato.core.helpers.request import getParams, jsonified from couchpotato.core.plugins.base import Plugin from couchpotato.core.settings.model import Movie from couchpotato.environment import Env +from sqlalchemy.sql.expression import or_ from urllib import urlencode @@ -32,9 +33,12 @@ class MoviePlugin(Plugin): params = getParams() db = get_session() - results = db.query(Movie).filter( - Movie.status.has(identifier = params.get('status', 'active')) - ).all() + # Make a list from string + status = params.get('status', ['active']) + if not isinstance(status, (list, tuple)): + status = [status] + + results = db.query(Movie).filter(or_(*[Movie.status.has(identifier = s) for s in status])).all() movies = [] for movie in results: diff --git a/couchpotato/static/scripts/page/wanted.js b/couchpotato/static/scripts/page/wanted.js index 48d860f..7b0d513 100644 --- a/couchpotato/static/scripts/page/wanted.js +++ b/couchpotato/static/scripts/page/wanted.js @@ -12,7 +12,7 @@ Page.Wanted = new Class({ // Wanted movies self.wanted = new MovieList({ - 'status': 'active', + 'status': ['active', 'snatched'], 'actions': WantedActions }); $(self.wanted).inject(self.el);