Show totals. close #393
This commit is contained in:
@@ -130,6 +130,8 @@ class MoviePlugin(Plugin):
|
||||
.filter(or_(*[Movie.status.has(identifier = s) for s in status])) \
|
||||
.group_by(Movie.id)
|
||||
|
||||
total_count = q.count()
|
||||
|
||||
filter_or = []
|
||||
if starts_with:
|
||||
starts_with = toUnicode(starts_with.lower())
|
||||
@@ -156,8 +158,7 @@ class MoviePlugin(Plugin):
|
||||
.options(joinedload_all('library.titles')) \
|
||||
.options(joinedload_all('library.files')) \
|
||||
.options(joinedload_all('status')) \
|
||||
.options(joinedload_all('files')) \
|
||||
|
||||
.options(joinedload_all('files'))
|
||||
|
||||
if limit_offset:
|
||||
splt = [x.strip() for x in limit_offset.split(',')]
|
||||
@@ -165,7 +166,6 @@ class MoviePlugin(Plugin):
|
||||
offset = 0 if len(splt) is 1 else splt[1]
|
||||
q2 = q2.limit(limit).offset(offset)
|
||||
|
||||
|
||||
results = q2.all()
|
||||
movies = []
|
||||
for movie in results:
|
||||
@@ -178,7 +178,7 @@ class MoviePlugin(Plugin):
|
||||
movies.append(temp)
|
||||
|
||||
#db.close()
|
||||
return movies
|
||||
return (total_count, movies)
|
||||
|
||||
def availableChars(self, status = ['active']):
|
||||
|
||||
@@ -214,11 +214,12 @@ class MoviePlugin(Plugin):
|
||||
starts_with = params.get('starts_with', None)
|
||||
search = params.get('search', None)
|
||||
|
||||
movies = self.list(status = status, limit_offset = limit_offset, starts_with = starts_with, search = search)
|
||||
total_movies, movies = self.list(status = status, limit_offset = limit_offset, starts_with = starts_with, search = search)
|
||||
|
||||
return jsonified({
|
||||
'success': True,
|
||||
'empty': len(movies) == 0,
|
||||
'total': total_movies,
|
||||
'movies': movies,
|
||||
})
|
||||
|
||||
|
||||
Reference in New Issue
Block a user