Skip to content

Commit

Permalink
Merge pull request #3567 from mansam/automatic-placement-quota-ui
Browse files Browse the repository at this point in the history
Provisioning properties tab should reflect that tenant will be chosen automatically
(cherry picked from commit 692a804)

Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1554832
  • Loading branch information
mzazrivec authored and simaishi committed Mar 13, 2018
1 parent c038775 commit e57679b
Showing 1 changed file with 6 additions and 1 deletion.
7 changes: 6 additions & 1 deletion app/views/miq_request/_prov_dialog_cloud_quota.html.haml
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,19 @@
- 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]) }

#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
Expand Down

0 comments on commit e57679b

Please sign in to comment.