Merge pull request #674 from h-kataria/fix_catalog_item_link

Fixed an error when clicking on items in Service Catalogs accordion

app/controllers/catalog_controller.rb

@@ -228,7 +228,7 @@ def explorer
       set_form_locals_for_sysprep
     end
     template_locals = {:locals => {:controller => "catalog"}}
-    template_locals[:locals].merge!(fetch_playbook_details) if TreeBuilder.get_model_for_prefix(@nodetype) == "ServiceTemplate" && !@view && @record.prov_type == "generic_ansible_playbook"
+    template_locals[:locals].merge!(fetch_playbook_details) if need_ansible_locals?
 
     render :layout => "application", :action => "explorer", :locals => template_locals
   end
@@ -1933,7 +1933,7 @@ def replace_right_cell(options = {})
           r[:partial => "shared/buttons/ab_list"]
         else
           template_locals = {:controller => "catalog"}
-          template_locals.merge!(fetch_playbook_details) if TreeBuilder.get_model_for_prefix(@nodetype) == "ServiceTemplate" && @record.prov_type == "generic_ansible_playbook"
+          template_locals.merge!(fetch_playbook_details) if need_ansible_locals?
           r[:partial => "catalog/#{x_active_tree}_show", :locals => template_locals]
         end
       elsif @sb[:buttons_node]
@@ -2027,6 +2027,12 @@ def replace_right_cell(options = {})
     render :json => presenter.for_render
   end
 
+  def need_ansible_locals?
+    x_active_tree == :sandt_tree &&
+      TreeBuilder.get_model_for_prefix(@nodetype) == "ServiceTemplate" &&
+      @record.prov_type == "generic_ansible_playbook"
+  end
+
   # Build a Catalog Items explorer tree
   def build_st_tree
     TreeBuilderCatalogItems.new('sandt_tree', 'sandt', @sb)

spec/controllers/catalog_controller_spec.rb

@@ -690,4 +690,44 @@
       expect(response).to have_http_status 200
     end
   end
+
+  context "#need_ansible_locals?" do
+    before do
+      controller.instance_variable_set(:@nodetype, 'st')
+      st = FactoryGirl.create(:service_template,
+                              :type      => "ServiceTemplateAnsiblePlaybook",
+                              :prov_type => "generic_ansible_playbook")
+      controller.instance_variable_set(:@record, st)
+    end
+
+    it "returns true for Ansible Playbook Service Template in Catalog Items accordion only" do
+      controller.instance_variable_set(:@sb,
+                                       :trees       => {:sandt_tree => {:open_nodes => []}},
+                                       :active_tree => :sandt_tree)
+      expect(controller.send(:need_ansible_locals?)).to be_truthy
+    end
+
+    it "returns false for Ansible Playbook Service Template in other accordions" do
+      controller.instance_variable_set(:@sb,
+                                       :trees       => {:svccat_tree => {:open_nodes => []}},
+                                       :active_tree => :svccat_tree)
+      expect(controller.send(:need_ansible_locals?)).to be_falsey
+    end
+
+    it "returns false for any other Service Template in Catalog Items accordions" do
+      controller.instance_variable_set(:@record, FactoryGirl.create(:service_template))
+      controller.instance_variable_set(:@sb,
+                                       :trees       => {:svccat_tree => {:open_nodes => []}},
+                                       :active_tree => :svccat_tree)
+      expect(controller.send(:need_ansible_locals?)).to be_falsey
+    end
+
+    it "returns false for any other Service Template in other accordions" do
+      controller.instance_variable_set(:@record, FactoryGirl.create(:service_template))
+      controller.instance_variable_set(:@sb,
+                                       :trees       => {:svccat_tree => {:open_nodes => []}},
+                                       :active_tree => :svccat_tree)
+      expect(controller.send(:need_ansible_locals?)).to be_falsey
+    end
+  end
 end