diff options
| author | Zuul <zuul@review.opendev.org> | 2023-03-01 14:57:48 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2023-03-01 14:57:48 +0000 |
| commit | e472a8faae60d76f9a80f73524b92574471d9f23 (patch) | |
| tree | 1fcba6d2ba5a136de3778e6b758260991b010971 | |
| parent | b85e38051b94f8b9b266d20b8284112d4ef1f217 (diff) | |
| parent | f3a6f2bd800a2c6aff577f0e0e14c3e6c326be6c (diff) | |
| download | horizon-e472a8faae60d76f9a80f73524b92574471d9f23.tar.gz | |
Merge "Fix instance table behavior after deleting an instance" into stable/yoga
| -rw-r--r-- | openstack_dashboard/api/nova.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/openstack_dashboard/api/nova.py b/openstack_dashboard/api/nova.py index 981b1148d..ca200d234 100644 --- a/openstack_dashboard/api/nova.py +++ b/openstack_dashboard/api/nova.py @@ -483,7 +483,7 @@ def server_list_paged(request, deleted = request.session.pop('server_deleted', None) view_marker = 'possibly_deleted' if deleted and marker else 'ok' - search_opts['marker'] = deleted if deleted else marker + search_opts['marker'] = marker if marker or deleted else None search_opts['limit'] = page_size + 1 # NOTE(amotoki): It looks like the 'sort_keys' must be unique to make # the pagination in the nova API works as expected. Multiple servers @@ -505,7 +505,7 @@ def server_list_paged(request, servers = [Server(s, request) for s in nova_client.servers.list(detailed, - search_opts, + search_opts=search_opts, sort_keys=sort_keys, sort_dirs=['desc'] * 3)] if not servers: @@ -514,7 +514,7 @@ def server_list_paged(request, servers = [Server(s, request) for s in nova_client.servers.list(detailed, - search_opts, + search_opts=search_opts, sort_keys=sort_keys, sort_dirs=['asc'] * 3)] (servers, has_more_data, has_prev_data) = update_pagination( |