diff options
| author | Zuul <zuul@review.opendev.org> | 2023-03-29 22:03:37 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2023-03-29 22:03:37 +0000 |
| commit | cb95e46406d32843a7f8d1b4994f9216aa0b92c6 (patch) | |
| tree | 81f9d27bdc214051b78362267365857ee3f5a7ca | |
| parent | 820bc4ef340d6bad9138eb105543f7150c7bfd10 (diff) | |
| parent | c2390030559357519e5a05c74becd6f35e568957 (diff) | |
| download | horizon-cb95e46406d32843a7f8d1b4994f9216aa0b92c6.tar.gz | |
Merge "Fix instance table behavior after deleting an instance" into stable/xena
| -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 29d56dc3f..b18a1717d 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( |