Skip to content

Commit b525694

Browse files
author
Vratislav Hais
committed
Method st_delete and x_edit_tags_reset done
1 parent f0dcce6 commit b525694

File tree

2 files changed

+17
-6
lines changed

2 files changed

+17
-6
lines changed

app/controllers/catalog_controller.rb

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -271,7 +271,6 @@ def x_show
271271
end
272272

273273
def st_delete
274-
binding.pry
275274
assert_privileges("catalogitem_delete")
276275
elements = []
277276
if params[:id]
@@ -283,7 +282,6 @@ def st_delete
283282
end
284283
else # showing 1 element, delete it
285284
elements = find_records_with_rbac(ServiceTemplate, find_checked_items).ids
286-
binding.pry
287285
if elements.empty?
288286
add_flash(_("No Service Catalog Items were selected for deletion"), :error)
289287
end
@@ -1816,6 +1814,7 @@ def get_node_info_handle_leaf_node(id)
18161814
# Get all info for the node about to be displayed
18171815
def get_node_info(treenodeid, _show_list = true)
18181816
@explorer ||= true
1817+
binding.pry
18191818
@nodetype, id = parse_nodetype_and_id(valid_active_node(treenodeid))
18201819
# saving this so it can be used while adding buttons/groups in buttons editor
18211820
@sb[:applies_to_id] = id
@@ -2179,7 +2178,7 @@ def dialog_catalog_check
21792178

21802179
def x_edit_tags_reset(db)
21812180
@tagging = session[:tag_db] = db
2182-
@object_ids = find_checked_ids_with_rbac(db)
2181+
@object_ids = find_records_with_rbac(db.safe_constantize, find_checked_items).ids
21832182
if params[:button] == 'reset'
21842183
id = params[:id] if params[:id]
21852184
return unless load_edit("#{session[:tag_db]}_edit_tags__#{id}", 'replace_cell__explorer')

spec/controllers/catalog_controller_spec.rb

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,15 +19,27 @@
1919
end
2020

2121
it "checks method st_delete" do
22-
binding.pry
2322
login_as admin_user
2423
allow(User).to receive(:current_user).and_return(admin_user)
2524
allow(controller).to receive(:checked_or_params).and_return(ServiceTemplate.all.ids)
26-
controller.instance_variable_set(:@settings, {}) # @settings params in controller
2725
controller.instance_variable_set(:@_params, {}) # affects params in controller
26+
allow(controller).to receive(:find_checked_items).and_return(ServiceTemplate.all.ids)
27+
allow(controller).to receive(:replace_right_cell)
28+
expect(controller).to receive(:process_sts).with(ServiceTemplate.all.ids, "destroy")
29+
controller.send(:st_delete)
30+
end
31+
32+
it "checks method x_edit_tags_reset" do
33+
login_as admin_user
34+
allow(User).to receive(:current_user).and_return(admin_user)
35+
allow(controller).to receive(:checked_or_params).and_return(ServiceTemplate.all.ids)
36+
controller.instance_variable_set(:@_params, {}) # affects params in controller
37+
controller.instance_variable_set(:@sb, {:action => nil})
2838
allow(controller).to receive(:checked_or_params).and_return(ServiceTemplate.all.ids)
2939
allow(controller).to receive(:find_checked_items).and_return(ServiceTemplate.all.ids)
30-
controller.send(:st_delete)
40+
allow(controller).to receive(:tag_edit_build_entries_pulldown).and_return(nil)
41+
allow(controller).to receive(:replace_right_cell).with(:action => nil)
42+
controller.send(:x_edit_tags_reset, "ServiceTemplate")
3143
end
3244

3345
context 'get_view' do

0 commit comments

Comments
 (0)