diff --git a/data/interfaces/default/info.html b/data/interfaces/default/info.html
index 6512dc93..9ff8e83f 100644
--- a/data/interfaces/default/info.html
+++ b/data/interfaces/default/info.html
@@ -263,7 +263,7 @@ from plexpy import helpers
type: 'post',
data: function ( d ) {
return { 'json_data': JSON.stringify( d ),
- 'grandparent_rating_key': ${data['grandparent_rating_key']}
+ 'grandparent_rating_key': ${data['rating_key']}
};
}
}
diff --git a/plexpy/datafactory.py b/plexpy/datafactory.py
index 12695013..ae84f12e 100644
--- a/plexpy/datafactory.py
+++ b/plexpy/datafactory.py
@@ -52,7 +52,9 @@ class DataFactory(object):
logger.warn("Unable to execute database query.")
return {'recordsFiltered': 0,
'recordsTotal': 0,
- 'data': 'null'},
+ 'draw': 0,
+ 'data': 'null',
+ 'error': 'Unable to execute database query.'}
users = query['result']
@@ -78,6 +80,7 @@ class DataFactory(object):
dict = {'recordsFiltered': query['filteredCount'],
'recordsTotal': query['totalCount'],
'data': rows,
+ 'draw': query['draw']
}
return dict
@@ -129,7 +132,9 @@ class DataFactory(object):
logger.warn("Unable to execute database query.")
return {'recordsFiltered': 0,
'recordsTotal': 0,
- 'data': 'null'},
+ 'draw': 0,
+ 'data': 'null',
+ 'error': 'Unable to execute database query.'}
history = query['result']
@@ -159,6 +164,7 @@ class DataFactory(object):
dict = {'recordsFiltered': query['filteredCount'],
'recordsTotal': query['totalCount'],
'data': rows,
+ 'draw': query['draw']
}
return dict
@@ -188,7 +194,9 @@ class DataFactory(object):
logger.warn("Unable to execute database query.")
return {'recordsFiltered': 0,
'recordsTotal': 0,
- 'data': 'null'},
+ 'draw': 0,
+ 'data': 'null',
+ 'error': 'Unable to execute database query.'}
results = query['result']
@@ -206,6 +214,7 @@ class DataFactory(object):
dict = {'recordsFiltered': query['filteredCount'],
'recordsTotal': query['totalCount'],
'data': rows,
+ 'draw': query['draw']
}
return dict
diff --git a/plexpy/datatables.py b/plexpy/datatables.py
index c5fdc8cb..3a499085 100644
--- a/plexpy/datatables.py
+++ b/plexpy/datatables.py
@@ -177,8 +177,12 @@ class DataTables(object):
# Build grand totals
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'])]
output = {'result': result,
+ 'draw': draw_counter,
'filteredCount': len(filtered),
'totalCount': totalcount}