Merge pull request #4242 from h-kataria/catalog_item_tagging_from_sum…

…mary

Pass in id of selected record correctly.

app/controllers/catalog_controller.rb

@@ -2196,7 +2196,8 @@ def dialog_catalog_check
 
   def x_edit_tags_reset(db)
     @tagging = session[:tag_db] = db
-    @object_ids = find_records_with_rbac(db.safe_constantize, find_checked_items).ids
+    checked_ids = find_checked_items.empty? ? [params[:id]] : find_checked_items
+    @object_ids = find_records_with_rbac(db.safe_constantize, checked_ids).ids
     if params[:button] == 'reset'
       id = params[:id] if params[:id]
       return unless load_edit("#{session[:tag_db]}_edit_tags__#{id}", 'replace_cell__explorer')

spec/controllers/catalog_controller_spec.rb

@@ -29,10 +29,10 @@
     controller.send(:st_delete)
   end
 
-  it "checks method x_edit_tags_reset" do
+  it "checks method x_edit_tags_reset when multiple records selected from list view" do
     login_as admin_user
     allow(User).to receive(:current_user).and_return(admin_user)
-    allow(controller).to receive(:checked_or_params).and_return(ServiceTemplate.all.ids)
+    controller.params["check_1"] = '1'
     controller.instance_variable_set(:@sb, :action => nil)
     allow(controller).to receive(:checked_or_params).and_return(ServiceTemplate.all.ids)
     allow(controller).to receive(:find_checked_items).and_return(ServiceTemplate.all.ids)
@@ -42,6 +42,19 @@
     controller.send(:x_edit_tags_reset, "ServiceTemplate")
   end
 
+  it "checks method x_edit_tags_reset when tagging from summary screen" do
+    login_as admin_user
+    allow(User).to receive(:current_user).and_return(admin_user)
+    controller.instance_variable_set(:@_params, :id => "#{service_template_with_child_tenant.id}")
+    controller.instance_variable_set(:@sb, :action => nil)
+    allow(controller).to receive(:checked_or_params).and_return([])
+    allow(controller).to receive(:find_checked_items).and_return([])
+    allow(controller).to receive(:tag_edit_build_entries_pulldown).and_return(nil)
+    allow(controller).to receive(:replace_right_cell).with(:action => nil)
+    expect(controller).to receive(:x_tags_set_form_vars)
+    controller.send(:x_edit_tags_reset, "ServiceTemplate")
+  end
+
   context 'get_view' do
     it "returns all catalog items related to current tenant and root tenant when non-self service user is logged" do
       login_as child_tenant_user