anonfunc/JellyPy
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix bug on info pages for Shows.

Browse Source 
Return error parameter to Datatables on exception.
Return draw counter to Datatables.
This commit is contained in:
Tim
2015-07-18 23:27:20 +02:00
parent 76279928bd
commit ba1dfea9eb
3 changed files with 17 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
data/interfaces/default/info.html
View File

@@ -263,7 +263,7 @@ from plexpy import helpers
type: 'post', type: 'post',
data: function ( d ) { data: function ( d ) {
return { 'json_data': JSON.stringify( d ), return { 'json_data': JSON.stringify( d ),
'grandparent_rating_key': ${data['grandparent_rating_key']} 'grandparent_rating_key': ${data['rating_key']}
}; };
} }
} }

15
plexpy/datafactory.py
View File

@@ -52,7 +52,9 @@ class DataFactory(object):
logger.warn("Unable to execute database query.") logger.warn("Unable to execute database query.")
return {'recordsFiltered': 0, return {'recordsFiltered': 0,
'recordsTotal': 0, 'recordsTotal': 0,
'data': 'null'}, 'draw': 0,
'data': 'null',
'error': 'Unable to execute database query.'}
users = query['result'] users = query['result']
@@ -78,6 +80,7 @@ class DataFactory(object):
dict = {'recordsFiltered': query['filteredCount'], dict = {'recordsFiltered': query['filteredCount'],
'recordsTotal': query['totalCount'], 'recordsTotal': query['totalCount'],
'data': rows, 'data': rows,
'draw': query['draw']
} }
return dict return dict
@@ -129,7 +132,9 @@ class DataFactory(object):
logger.warn("Unable to execute database query.") logger.warn("Unable to execute database query.")
return {'recordsFiltered': 0, return {'recordsFiltered': 0,
'recordsTotal': 0, 'recordsTotal': 0,
'data': 'null'}, 'draw': 0,
'data': 'null',
'error': 'Unable to execute database query.'}
history = query['result'] history = query['result']
@@ -159,6 +164,7 @@ class DataFactory(object):
dict = {'recordsFiltered': query['filteredCount'], dict = {'recordsFiltered': query['filteredCount'],
'recordsTotal': query['totalCount'], 'recordsTotal': query['totalCount'],
'data': rows, 'data': rows,
'draw': query['draw']
} }
return dict return dict
@@ -188,7 +194,9 @@ class DataFactory(object):
logger.warn("Unable to execute database query.") logger.warn("Unable to execute database query.")
return {'recordsFiltered': 0, return {'recordsFiltered': 0,
'recordsTotal': 0, 'recordsTotal': 0,
'data': 'null'}, 'draw': 0,
'data': 'null',
'error': 'Unable to execute database query.'}
results = query['result'] results = query['result']
@@ -206,6 +214,7 @@ class DataFactory(object):
dict = {'recordsFiltered': query['filteredCount'], dict = {'recordsFiltered': query['filteredCount'],
'recordsTotal': query['totalCount'], 'recordsTotal': query['totalCount'],
'data': rows, 'data': rows,
'draw': query['draw']
} }
return dict return dict

4
plexpy/datatables.py
View File

@@ -177,8 +177,12 @@ class DataTables(object):
# Build grand totals # Build grand totals
totalcount = self.ssp_db.select('SELECT COUNT(id) from %s' % table_name)[0][0] totalcount = self.ssp_db.select('SELECT COUNT(id) from %s' % table_name)[0][0]
# Get draw counter
draw_counter = int(parameters['draw'])
result = filtered[parameters['start']:(parameters['start'] + parameters['length'])] result = filtered[parameters['start']:(parameters['start'] + parameters['length'])]
output = {'result': result, output = {'result': result,
'draw': draw_counter,
'filteredCount': len(filtered), 'filteredCount': len(filtered),
'totalCount': totalcount} 'totalCount': totalcount}