Skip to content

Commit

Permalink
Merge pull request #3210 from h-kataria/hac_vat_tree_access_fix
Browse files Browse the repository at this point in the history
Added RBAC filtering to HAC and VAT tree builder code.
  • Loading branch information
Dan Clarizio committed Jan 9, 2018
2 parents 2c73878 + 9d71bee commit 5e755bc
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions app/presenters/tree_builder_vat.rb
Expand Up @@ -38,20 +38,20 @@ def x_get_tree_folder_kids(parent, count_only, _type)
objects = count_only ? 0 : []

if parent.name == "Datacenters"
objects = count_only_or_many_objects(count_only, parent.folders_only, parent.datacenters_only, "name")
objects = count_only_or_many_objects(count_only, Rbac.filtered(parent.folders_only), Rbac.filtered(parent.datacenters_only), "name")
elsif parent.name == "host" && parent.parent.kind_of?(Datacenter)
unless @vat
objects = count_only_or_many_objects(count_only, parent.folders_only, parent.clusters, parent.hosts, "name")
objects = count_only_or_many_objects(count_only, Rbac.filtered(parent.folders_only), Rbac.filtered(parent.clusters), Rbac.filtered(parent.hosts), "name")
end
elsif parent.name == "datastore" && parent.parent.kind_of?(Datacenter)
# Skip showing the datastore folder and sub-folders
elsif parent.name == "vm" && parent.parent.kind_of?(Datacenter)
if @vat
objects = count_only_or_many_objects(count_only, parent.folders_only, parent.vms, "name")
objects = count_only_or_many_objects(count_only, Rbac.filtered(parent.folders_only), Rbac.filtered(parent.vms), "name")
end
else
objects = count_only_or_many_objects(count_only, parent.folders_only, parent.datacenters_only,
parent.clusters, parent.hosts, parent.vms, "name")
objects = count_only_or_many_objects(count_only, Rbac.filtered(parent.folders_only), Rbac.filtered(parent.datacenters_only),
Rbac.filtered(parent.clusters), Rbac.filtered(parent.hosts), Rbac.filtered(parent.vms), "name")
end
objects
end
Expand Down

0 comments on commit 5e755bc

Please sign in to comment.