moksha/connector/connector.py | 28 +++++++++++++------------- moksha/public/javascript/ui/moksha.ui.grid.js | 20 +++++++++--------- 2 files changed, 25 insertions(+), 23 deletions(-)
New commits: commit 7f8d22819ac740cef065b9cfebb4ba3580d8d841 Author: John (J5) Palmieri johnp@redhat.com Date: Tue Mar 17 17:55:05 2009 -0400
fix some inconsistencies
diff --git a/moksha/connector/connector.py b/moksha/connector/connector.py index 41a1180..4045e1c 100644 --- a/moksha/connector/connector.py +++ b/moksha/connector/connector.py @@ -217,8 +217,8 @@ class IQuery(object): _paths = {}
def query(self, resource_path, params, _cookies, - offset = 0, - num_rows = 10, + start_row = 0, + rows_per_page = 10, sort_col = None, sort_order = -1, filters = {}): @@ -239,8 +239,8 @@ class IQuery(object): with the request. If your resource does not use cookies you may use these values how inline with what the resource expects or ignore them completely. - :offset: if pagination is supported this sets the row to start at - :num_rows: if pagination is supported this sets how many rows to + :start_row: if pagination is supported this sets the row to start at + :rows_per_page: if pagination is supported this sets how many rows to return :sort_col: Which column we should sort by. None = default :sort_order: 1 = ascending, -1 = descending @@ -262,9 +262,10 @@ class IQuery(object): A hash with format: { "total_rows": total_rows, # number of rows matched by query - "row_count": row_count, # number of rows actually returned + "rows_per_page": rows_per_page, # number of rows requested # due to pagination - "offset": offset, # number of first row returned due + "visible_rows": len(rows) # num of rows actually returned + "start_row": start_row, # number of first row returned due # to pagination "rows": rows # list of rows which were returned } @@ -273,8 +274,8 @@ class IQuery(object): results = None r = { "total_rows": 0, - "row_count": 0, - "offset": 0, + "rows_per_page": 0, + "start_row": 0, "rows": None }
@@ -286,16 +287,17 @@ class IQuery(object):
query_func = self.query_model(resource_path).get_query() (total_rows, rows) = query_func(self, - offset = offset, - limit = num_rows, + start_row = start_row, + rows_per_page = rows_per_page, order = sort_order, sort_col = sort_col, filters = filters, **params) r['total_rows'] = total_rows - r['row_count'] = len(rows) - if offset: - r['offset'] = offset + r['rows_per_page'] = rows_per_page + r['visible_rows'] = len(rows) + if start_row: + r['start_row'] = start_row r['rows'] = rows
results = r diff --git a/moksha/public/javascript/ui/moksha.ui.grid.js b/moksha/public/javascript/ui/moksha.ui.grid.js index 328820f..af6499c 100644 --- a/moksha/public/javascript/ui/moksha.ui.grid.js +++ b/moksha/public/javascript/ui/moksha.ui.grid.js @@ -89,7 +89,7 @@ var self = this;
self.element.find('tbody').fadeOut('slow'); - if (moksha_csrf_token) + if (typeof(moksha_csrf_token)!='undefined' && moksha_csrf_token) args['_csrf_token'] = moksha_csrf_token; var xmlrequest = jQuery.getJSON(path, args, function (json) { callback(json); @@ -125,7 +125,7 @@ var search_criteria = { filters: o.filters, start_row: start_row, - rows_requested: rpp, + rows_per_page: rpp, sort_key: o.sort_key, sort_order: o.sort_order, } @@ -139,8 +139,8 @@
var sc = search_criteria;
- if (typeof(sc.rows_requested) != 'undefined') - self.options.rows_per_page = sc.rows_requested; + if (typeof(sc.rows_per_page) != 'undefined') + self.options.rows_per_page = sc.rows_per_page;
if (typeof(sc.page_num) != 'undefined') self.options.page_num = sc.page_num; @@ -177,13 +177,13 @@ if (typeof(filters) != 'undefined') dispatch_data['filters'] = filters
- var numrows = search_criteria.numrows - if (typeof(numrows) != 'undefined') - dispatch_data['numrows'] = numrows + var rows_per_page = search_criteria.rows_per_page + if (typeof(rows_per_page) != 'undefined') + dispatch_data['rows_per_page'] = rows_per_page
- var offset = search_criteria.start_row - if (typeof(offset) != 'undefined') - dispatch_data['offset'] = offset + var start_row = search_criteria.start_row + if (typeof(start_row) != 'undefined') + dispatch_data['start_row'] = start_row
if (search_criteria.sort_key) { dispatch_data["sort_col"] = search_criteria.sort_key;
moksha-commits@lists.fedorahosted.org