Merge pull request #446 from himdel/i440-catalog-items-display

Catalog Items - show all items, regardless of display=true
ManageIQ · Feb 22, 2017 · 98d07bd · 98d07bd
2 parents a718cf7 + 8beaf07
commit 98d07bd
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/app/controllers/catalog_controller.rb b/app/controllers/catalog_controller.rb
@@ -1695,7 +1695,12 @@ def get_node_info(treenodeid)
                                    {:typ   => ui_lookup(:models => "Service"),
                                     :model => ui_lookup(:model => "ServiceTemplateCatalog")}
               else
-                condition = ["display=? and service_template_catalog_id=? and service_template_catalog_id IS NOT NULL", true, from_cid(id)]
+                if x_active_tree == :sandt_tree
+                  # catalog items accordion also shows the non-"Display in Catalog" items
+                  condition = ["service_template_catalog_id=? and service_template_catalog_id IS NOT NULL", from_cid(id)]
+                else
+                  condition = ["display=? and service_template_catalog_id=? and service_template_catalog_id IS NOT NULL", true, from_cid(id)]
+                end
                 service_template_list(condition, :model => model, :no_order_button => true)
                 stc = ServiceTemplateCatalog.find_by_id(from_cid(id))
                 @right_cell_text = _("%{typ} in %{model} \"%{name}\"") % {:name => stc.name, :typ => ui_lookup(:models => "Service"), :model => ui_lookup(:model => "ServiceTemplateCatalog")}