summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHeather Lemon <heather.lemon@canonical.com>2021-04-28 07:56:52 -0600
committerTatiana Ovchinnikova <t.v.ovtchinnikova@gmail.com>2023-02-02 19:38:33 +0000
commitf3a6f2bd800a2c6aff577f0e0e14c3e6c326be6c (patch)
treedf53e1bf1e457743423f442e054de91ea128006e
parentcefc8bc0db5c3ed53238bcdca74c65cccd8ade67 (diff)
downloadhorizon-f3a6f2bd800a2c6aff577f0e0e14c3e6c326be6c.tar.gz
Fix instance table behavior after deleting an instance
After deleting a VM from the instances table, all VMs above it in the table list disappear from the UI until the page is refreshed. Partial-Bug: #1859851 Change-Id: Icae04fd0f0c3f3fa5127309b64fc1b15e3bbc677 (cherry picked from commit c90c0b709c170fae299acc5917e7da69fb2ef2a8)
-rw-r--r--openstack_dashboard/api/nova.py6
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(