From e57679b6ef5189275ce0fba69734dc58c215648e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Milan=20Z=C3=A1zrivec?= Date: Tue, 13 Mar 2018 09:25:26 +0100 Subject: [PATCH] Merge pull request #3567 from mansam/automatic-placement-quota-ui Provisioning properties tab should reflect that tenant will be chosen automatically (cherry picked from commit 692a804babab07248512a6c7b15e8296f9b1fda5) Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1554832 --- app/views/miq_request/_prov_dialog_cloud_quota.html.haml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/app/views/miq_request/_prov_dialog_cloud_quota.html.haml b/app/views/miq_request/_prov_dialog_cloud_quota.html.haml index b00ab7f2a3b..dcb163a9ef1 100644 --- a/app/views/miq_request/_prov_dialog_cloud_quota.html.haml +++ b/app/views/miq_request/_prov_dialog_cloud_quota.html.haml @@ -7,6 +7,7 @@ - cloud_tenant_name = @edit[:new][:cloud_tenant][1] - cloud_tenant_id = @edit[:new][:cloud_tenant][0] - instance_type = @edit[:new][:instance_type][1] + - placement_auto = @edit[:new][:placement_auto][0] -# [:service, :quota_name, "label"] - quotas = [[:compute, :instances, _("instances")], [:compute, :cores, _("vcpus")], [:compute, :ram, _("(MB) memory")]] - quotas = quotas.each_with_object({}) { |q, h| h[q[2]] = lookup_quota(cloud_tenant_id, q[0], q[1]) } @@ -14,7 +15,11 @@ #cloud_quota %p{:class => "legend"} = _("Cloud Quota") - - if cloud_tenant_name + - if placement_auto + = _("Cloud Tenant:") + %strong + = _("Automatic Placement") + - elsif cloud_tenant_name = _("Cloud Tenant:") %strong = cloud_tenant_name