Merge pull request #8927 from GilbertCherrie/fix_service_catalog_permission_errors

Fixed service catalog permission errors

Author: Fryguy

app/controllers/catalog_controller.rb

@@ -396,7 +396,7 @@ def x_show
     @sb[:action] = nil
     @explorer = true
     if x_active_tree == :stcat_tree
-      assert_privileges("catalog_items_view")
+      assert_privileges("st_catalog_view")
 
       if params[:rec_id]
         # link to Catalog Item clicked on catalog summary screen
@@ -406,12 +406,17 @@ def x_show
       else
         @record = ServiceTemplateCatalog.find(params[:id])
       end
+    elsif x_active_tree == :sandt_tree
+      assert_privileges("catalog_items_view")
+
+      identify_catalog(params[:id])
+      @record ||= ServiceTemplateCatalog.find(params[:id])
     elsif x_active_tree == :ot_tree
       assert_privileges("orchestration_templates_view")
 
       @record ||= OrchestrationTemplate.find(params[:id])
     else
-      assert_privileges("st_catalog_view")
+      assert_privileges("svc_catalog_provision", "svc_catalog_archive", "svc_catalog_unarchive")
 
       identify_catalog(params[:id])
       @record ||= ServiceTemplateCatalog.find(params[:id])