Merge pull request #9622 from GilbertCherrie/fix_single_tag

Fix single tag page bug

Author: Fryguy

app/controllers/application_controller/tags.rb

@@ -172,7 +172,7 @@ def tag_edit_build_screen
 
     @tagitems = @tagging.constantize.where(:id => @object_ids).sort_by { |t| t.name.try(:downcase).to_s }
 
-    @view = get_db_view(@tagging, :clickable => false) # Instantiate the MIQ Report view object
+    @view = get_db_view(@tagging, :clickable => false, :no_checkboxes => true) # Instantiate the MIQ Report view object
 
     @edit[:new][:assignments] = assignments = @tagitems.map do |tagitem|
       Classification.find_assigned_entries(tagitem).reject { |e| e.parent.read_only? }

app/controllers/mixins/checked_id_mixin.rb

@@ -10,7 +10,21 @@ def checked_item_id(hash = params)
     # Common routine to find checked items on a page (checkbox ids are
     # "check_xxx" where xxx is the item id or index)
     def find_checked_items(prefix = nil)
-      if params[:miq_grid_checks].present?
+      nested_list_item_key = ""
+      # Check if nested list items are tagged.
+      if params["miq_grid_checks"].present?
+        nested_list_item = params["miq_grid_checks"].split(",")[0]
+
+        # Create param string
+        nested_list_item_key = "select-row-#{nested_list_item}"
+      end
+
+      has_no_check = params.each_key.none? { |var| var.start_with?("check_") }
+
+      # If id is present use id, unless when nested list exists, example on summary pages
+      if params[:id].present? && params[nested_list_item_key] != "on" && has_no_check
+        Array.wrap(params[:id])
+      elsif params[:miq_grid_checks].present?
         params[:miq_grid_checks].split(",").collect(&:to_i)
       else
         prefix = "check" if prefix.nil?

spec/controllers/application_controller_spec.rb

@@ -120,14 +120,14 @@
   end
 
   describe "#find_checked_items" do
-    it "returns empty array when button is pressed from summary screen with params as symbol" do
+    it "returns array with id when button is pressed from summary screen with params as symbol" do
       controller.params = {:id => "1"}
-      expect(controller.send(:find_checked_items)).to eq([])
+      expect(controller.send(:find_checked_items)).to eq(["1"])
     end
 
-    it "returns empty array when button is pressed from summary screen with params as string" do
+    it "returns array with id when button is pressed from summary screen with params as string" do
       controller.params = {"id" => "1"}
-      expect(controller.send(:find_checked_items)).to eq([])
+      expect(controller.send(:find_checked_items)).to eq(["1"])
     end
 
     it "returns list of items selected from list view" do

spec/controllers/auth_key_pair_cloud_controller_spec.rb

@@ -90,7 +90,7 @@
         allow(controller).to receive(:performed?).and_return(true)
         allow(controller).to receive(:render)
         controller.instance_variable_set(:@display, 'instances')
-        controller.params = {:miq_grid_checks => vm_instance.id.to_s, :pressed => 'instance_check_compliance', :id => kp.id.to_s, :controller => 'auth_key_pair_cloud'}
+        controller.params = {:miq_grid_checks => vm_instance.id.to_s, "select-row-#{vm_instance.id.to_s}" => "on", :pressed => 'instance_check_compliance', :id => kp.id.to_s, :controller => 'auth_key_pair_cloud'}
       end
 
       it 'does not initiate Check Compliance because of missing Compliance policies' do

spec/controllers/availability_zone_controller_spec.rb

@@ -32,7 +32,7 @@
         allow(controller).to receive(:performed?).and_return(true)
         allow(controller).to receive(:render)
         controller.instance_variable_set(:@display, 'instances')
-        controller.params = {:miq_grid_checks => vm_instance.id.to_s, :pressed => 'instance_check_compliance', :id => av_zone.id.to_s, :controller => 'availability_zone'}
+        controller.params = {:miq_grid_checks => vm_instance.id.to_s, "select-row-#{vm_instance.id.to_s}" => "on", :pressed => 'instance_check_compliance', :id => av_zone.id.to_s, :controller => 'availability_zone'}
       end
 
       it 'does not initiate Check Compliance because of missing Compliance policies' do

spec/controllers/cloud_network_controller_spec.rb

@@ -396,7 +396,7 @@
     end
 
     context 'Check Compliance of Instances displayed in a nested list' do
-      let(:params) { {:miq_grid_checks => vm_instance.id.to_s, :pressed => 'instance_check_compliance', :id => network.id.to_s, :controller => 'cloud_network'} }
+      let(:params) { {:miq_grid_checks => vm_instance.id.to_s, "select-row-#{vm_instance.id.to_s}" => "on", :pressed => 'instance_check_compliance', :id => network.id.to_s, :controller => 'cloud_network'} }
       let(:vm_instance) { FactoryBot.create(:vm_or_template) }
 
       before { allow(controller).to receive(:performed?).and_return(true) }

spec/controllers/cloud_subnet_controller_spec.rb

@@ -334,7 +334,7 @@
     end
 
     context 'Check Compliance of Instances displayed in a nested list' do
-      let(:params) { {:miq_grid_checks => vm_instance.id.to_s, :pressed => 'instance_check_compliance', :id => cloud_subnet.id.to_s, :controller => 'cloud_subnet'} }
+      let(:params) { {:miq_grid_checks => vm_instance.id.to_s, "select-row-#{vm_instance.id.to_s}" => "on", :pressed => 'instance_check_compliance', :id => cloud_subnet.id.to_s, :controller => 'cloud_subnet'} }
       let(:vm_instance) { FactoryBot.create(:vm_or_template) }
 
       before { allow(controller).to receive(:performed?).and_return(true) }

spec/controllers/cloud_tenant_controller_spec.rb

@@ -50,7 +50,7 @@
         allow(controller).to receive(:performed?).and_return(true)
         allow(controller).to receive(:render)
         controller.instance_variable_set(:@display, 'instances')
-        controller.params = {:miq_grid_checks => vm_instance.id.to_s, :pressed => 'instance_check_compliance', :id => tenant.id.to_s, :controller => 'cloud_tenant'}
+        controller.params = {:miq_grid_checks => vm_instance.id.to_s, "select-row-#{vm_instance.id.to_s}" => "on", :pressed => 'instance_check_compliance', :id => tenant.id.to_s, :controller => 'cloud_tenant'}
       end
 
       it 'does not initiate Check Compliance because of missing Compliance policies' do

spec/controllers/ems_cloud_controller_spec.rb

@@ -274,7 +274,7 @@ def verify_password_and_confirm(password, verify)
         allow(controller).to receive(:performed?).and_return(true)
         allow(controller).to receive(:render)
         controller.instance_variable_set(:@display, 'instances')
-        controller.params = {:miq_grid_checks => vm_instance.id.to_s, :pressed => 'instance_check_compliance', :id => ems.id.to_s, :controller => 'ems_cloud'}
+        controller.params = {:miq_grid_checks => vm_instance.id.to_s, "select-row-#{vm_instance.id.to_s}" => "on", :pressed => 'instance_check_compliance', :id => ems.id.to_s, :controller => 'ems_cloud'}
       end
 
       it 'does not initiate Check Compliance because of missing Compliance policies' do

spec/controllers/ems_cluster_controller_spec.rb

@@ -71,7 +71,7 @@
         allow(controller).to receive(:render)
         allow(controller).to receive(:show)
         controller.instance_variable_set(:@display, 'vms')
-        controller.params = {:miq_grid_checks => vm.id.to_s, :pressed => 'vm_check_compliance', :id => cluster.id.to_s, :controller => 'ems_cluster'}
+        controller.params = {:miq_grid_checks => vm.id.to_s, "select-row-#{vm.id.to_s}" => "on", :pressed => 'vm_check_compliance', :id => cluster.id.to_s, :controller => 'ems_cluster'}
       end
 
       it 'does not initiate Check Compliance because of missing Compliance policies' do
@@ -105,7 +105,7 @@
         allow(controller).to receive(:drop_breadcrumb)
         allow(controller).to receive(:records_support_feature?).and_return(true)
         allow(controller).to receive(:render)
-        controller.params = {:id => cluster.id.to_s, :miq_grid_checks => vm.id.to_s, :pressed => 'vm_scan' }
+        controller.params = {:id => cluster.id.to_s, :miq_grid_checks => vm.id.to_s, "select-row-#{vm.id.to_s}" => "on", :pressed => 'vm_scan' }
       end
 
       %w[vms all_vms].each do |display|
@@ -127,7 +127,7 @@
         it 'initiates SSA for selected Template successfully' do
           controller.params = {:display => 'miq_templates', :id => cluster.id.to_s}
           controller.send(:show)
-          controller.params = {:id => cluster.id.to_s, :miq_grid_checks => template.id.to_s, :pressed => 'miq_template_scan'}
+          controller.params = {:id => cluster.id.to_s, :miq_grid_checks => template.id.to_s, "select-row-#{template.id.to_s}" => "on", :pressed => 'miq_template_scan'}
           controller.send(:button)
           expect(controller.instance_variable_get(:@record)).to eq(cluster)
           expect(controller.instance_variable_get(:@view).db).to eq('MiqTemplate')