openstack
/
horizon
Code Issues Proposed changes

Merge "Fix instance table behavior after deleting an instance" into stable/xena

This commit is contained in:
Zuul 2023-03-29 22:03:37 +00:00 committed by Gerrit Code Review
parent 820bc4ef34 c239003055
commit cb95e46406
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
openstack_dashboard/api/nova.py
View File

@ -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(