diff options
| author | Zuul <zuul@review.opendev.org> | 2023-02-11 00:58:03 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2023-02-11 00:58:03 +0000 |
| commit | 3701f2d5cf404daff358f8a3f88c5ec5345188ac (patch) | |
| tree | 26421f0300a190cd43d793260ddd1f48b4f93353 | |
| parent | e39b3e2bdb5a7a093eee2ea0fc998dcfd93c7433 (diff) | |
| parent | 13824f3af96ac9102882870ac828daa914eb7fd2 (diff) | |
| download | horizon-3701f2d5cf404daff358f8a3f88c5ec5345188ac.tar.gz | |
Merge "Fix instance table behavior after deleting an instance" into stable/zed
| -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 03bdee1a9..5c301758f 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( |