Merge pull request #9030 from jeffibm/fix-request-info-tabs

Fix for the error messages in Request-info tabs in the Service catalog item summary pages

Author: DavidResende0

app/controllers/catalog_controller.rb

@@ -350,8 +350,6 @@ def explorer
       return
     end
 
-    build_accordions_and_trees
-
     if params[:id] && !params[:button] # If a tree node id came in, show in one of the trees
       @nodetype, id = parse_nodetype_and_id(params[:id])
       self.x_active_tree   = 'sandt_tree'
@@ -364,6 +362,8 @@ def explorer
       @in_a_form = false
     end
 
+    build_accordions_and_trees
+
     if params[:commit] == "Upload" && session.fetch_path(:edit, :new, :sysprep_enabled, 1) == "Sysprep Answer File"
       upload_sysprep_file
       set_form_locals_for_sysprep

app/controllers/service_controller.rb

@@ -18,6 +18,7 @@ def show_list
 
   def show
     super
+    @options = {}
     @view, @pages = get_view(Vm, :parent => @record, :parent_method => :all_vms, :all_pages => true)
   end