openstack/horizon
Code Issues Proposed changes

Merge "Disable "Associate floating IP" when instance error"

Browse Source
This commit is contained in:
Jenkins
2015-03-31 02:05:22 +00:00
committed by Gerrit Code Review
parent a31b770bfb 912f266556
commit efc0a28338
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
openstack_dashboard/dashboards/project/instances/tables.py
View File

@@ -556,6 +556,8 @@ class AssociateIP(policy.PolicyTargetMixin, tables.LinkAction):
return False return False
if api.network.floating_ip_simple_associate_supported(request): if api.network.floating_ip_simple_associate_supported(request):
return False return False
if instance.status == "ERROR":
return False
return not is_deleting(instance) return not is_deleting(instance)
def get_link_url(self, datum): def get_link_url(self, datum):
@@ -577,6 +579,8 @@ class SimpleAssociateIP(policy.PolicyTargetMixin, tables.Action):
def allowed(self, request, instance): def allowed(self, request, instance):
if not api.network.floating_ip_simple_associate_supported(request): if not api.network.floating_ip_simple_associate_supported(request):
return False return False
if instance.status == "ERROR":
return False
return not is_deleting(instance) return not is_deleting(instance)
def single(self, table, request, instance_id): def single(self, table, request, instance_id):