diff --git a/app/controllers/catalog_controller.rb b/app/controllers/catalog_controller.rb index 72a972dc55a..b270deb472a 100644 --- 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")}