Merge pull request #1229 from hayesr/fix_rbac_features_regression

Fix Features Tree for "everything under" features
ManageIQ · Jun 15, 2017 · 086f2e2 · 086f2e2
2 parents a7907c9 + b8c1008
commit 086f2e2
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 2 deletions.
diff --git a/app/presenters/tree_builder_ops_rbac_features.rb b/app/presenters/tree_builder_ops_rbac_features.rb
@@ -6,7 +6,7 @@ class TreeBuilderOpsRbacFeatures < TreeBuilder
   def initialize(name, type, sandbox, build, role:, editable: false)
     @role     = role
     @editable = editable
-    @features = @role.miq_product_features.order(:identifier).pluck(:identifier)
+    @features = @role.miq_product_features.map(&:identifier)
 
     @root_counter = []
 

diff --git a/app/presenters/tree_node/menu/item.rb b/app/presenters/tree_node/menu/item.rb
@@ -4,13 +4,25 @@ class Item < TreeNode::Menu::Node
       set_attribute(:key)      { "#{@options[:node_id_prefix]}__#{@object.feature}" }
       set_attribute(:title)    { _(details[:name]) }
       set_attribute(:tooltip)  { _(details[:description]) || _(details[:name]) }
-      set_attribute(:selected) { @options[:features].include?(@object.feature) }
+      set_attribute(:selected) { parent_selected? || self_selected? }
 
       private
 
       def details
         ::MiqProductFeature.obj_features[@object.feature].try(:[], :feature).try(:details)
       end
+
+      def feature_parent
+        ::MiqProductFeature.obj_features[::MiqProductFeature.feature_parent(@object.feature)][:feature]
+      end
+
+      def parent_selected?
+        @options[:features].include?(feature_parent.identifier)
+      end
+
+      def self_selected?
+        @options[:features].include?(@object.feature)
+      end
     end
   end
 end