openstack
/
horizon
Code Issues Proposed changes

Merge "Fix mismatched attach_volume rule"

This commit is contained in:
Zuul 2018-05-23 05:06:43 +00:00 committed by Gerrit Code Review
parent a3cc0625a6 8e3903902d
commit 3ca4a5deb8
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -892,7 +892,8 @@ class AttachVolume(tables.LinkAction):
verbose_name = _("Attach Volume")
url = "horizon:project:instances:attach_volume"
classes = ("ajax-modal",)
policy_rules = (("compute", "os_compute_api:servers:attach_volume"),)
policy_rules = (
("compute", "os_compute_api:servers:create:attach_volume"),)
# This action should be disabled if the instance
# is not active, or the instance is being deleted

2
openstack_dashboard/dashboards/project/volumes/tables.py
View File

@ -188,7 +188,7 @@ class EditAttachments(tables.LinkAction):
project_id = getattr(volume, "os-vol-tenant-attr:tenant_id", None)
attach_allowed = \
policy.check((("compute",
"os_compute_api:servers:attach_volume"),),
"os_compute_api:servers:create:attach_volume"),),
request,
{"project_id": project_id})
detach_allowed = \