openstack/deb-murano
Code Issues Proposed changes

Support specifying `sort_dir` key in packages.search call

Browse Source 
Required to implement 'Previous Page' button at App Catalog page
in dashboard.

Change-Id: I9dc110be02e3aaf47c4c876569d01029da48359e
Targets: blueprint normalize-dashboard-pagination
This commit is contained in:
Timur Sufiev 2014-06-16 19:54:18 +04:00
parent fe6dec9da7
commit 75f778ac30
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
murano/api/v1/__init__.py
View File

@ -19,7 +19,7 @@ stats = None
SUPPORTED_PARAMS = ('order_by', 'category', 'marker', 'tag', 'class_name', SUPPORTED_PARAMS = ('order_by', 'category', 'marker', 'tag', 'class_name',
'limit', 'type', 'fqn', 'category', 'owned', 'search', 'limit', 'type', 'fqn', 'category', 'owned', 'search',
'include_disabled') 'include_disabled', 'sort_dir')
LIST_PARAMS = ('category', 'tag', 'class', 'order_by') LIST_PARAMS = ('category', 'tag', 'class', 'order_by')
ORDER_VALUES = ('fqn', 'name', 'created') ORDER_VALUES = ('fqn', 'name', 'created')
PKG_PARAMS_MAP = {'display_name': 'name', PKG_PARAMS_MAP = {'display_name': 'name',

4
murano/db/catalog/api.py
View File

@ -317,9 +317,11 @@ def package_search(filters, context, limit=None):
sort_keys = [SEARCH_MAPPING[sort_key] for sort_key in sort_keys = [SEARCH_MAPPING[sort_key] for sort_key in
filters.get('order_by', []) or ['created']] filters.get('order_by', []) or ['created']]
marker = filters.get('marker') marker = filters.get('marker')
sort_dir = filters.get('sort_dir')
if marker is not None: # set marker to real object instead of its id if marker is not None: # set marker to real object instead of its id
marker = _package_get(marker, session) marker = _package_get(marker, session)
query = utils.paginate_query(query, pkg, limit, sort_keys, marker) query = utils.paginate_query(
query, pkg, limit, sort_keys, marker, sort_dir)
return query.all() return query.all()