Skip to content

Commit f2c46c5

Browse files
Merge pull request #9308 from liu-samuel/remove-automate-copy-paste
Remove copy and paste button for automation simulation
2 parents 8c73066 + 11e0659 commit f2c46c5

File tree

6 files changed

+0
-118
lines changed

6 files changed

+0
-118
lines changed

app/controllers/application_controller/automate.rb

Lines changed: 0 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -33,36 +33,6 @@ def resolve_button_throw
3333
end
3434
private :resolve_button_throw
3535

36-
# Copy current URI as an automate button
37-
def resolve_button_copy
38-
session[:resolve_object] = copy_hash(@resolve)
39-
head :ok
40-
end
41-
private :resolve_button_copy
42-
43-
# Copy current URI as an automate button
44-
def resolve_button_paste
45-
@resolve = copy_hash(session[:resolve_object])
46-
@edit = session[:edit]
47-
@custom_button = @edit[:custom_button]
48-
@edit[:instance_names] = @resolve[:instance_names]
49-
@edit[:new][:instance_name] = @resolve[:new][:instance_name]
50-
@edit[:new][:object_message] = @resolve[:new][:object_message]
51-
@edit[:new][:object_request] = @resolve[:new][:object_request]
52-
@edit[:new][:attrs] = @resolve[:new][:attrs]
53-
@edit[:new][:target_class] = @resolve[:target_class] = @resolve[:new][:target_class]
54-
@edit[:uri] = @resolve[:uri]
55-
(ApplicationController::AE_MAX_RESOLUTION_FIELDS - @resolve[:new][:attrs].length).times { @edit[:new][:attrs].push([]) }
56-
@changed = (@edit[:new] != @edit[:current])
57-
render :update do |page|
58-
page << javascript_prologue
59-
page.replace_html("main_div", :partial => "shared/buttons/ab_list")
60-
page << javascript_for_miq_button_visibility_changed(@changed)
61-
page << "miqSparkle(false);"
62-
end
63-
end
64-
private :resolve_button_paste
65-
6636
# Copy current URI as an automate button
6737
def resolve_button_simulate
6838
@edit = copy_hash(session[:resolve])
@@ -126,8 +96,6 @@ def resolve
12696

12797
case params[:button]
12898
when "throw", "retry" then resolve_button_throw
129-
when "copy" then resolve_button_copy
130-
when "paste" then resolve_button_paste
13199
when "simulate" then resolve_button_simulate
132100
else resolve_button_reset_or_none
133101
end

app/helpers/application_helper/button/ae_copy_simulate.rb

Lines changed: 0 additions & 8 deletions
This file was deleted.
Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,2 @@
11
class ApplicationHelper::Toolbar::MiqAeToolsSimulateCenter < ApplicationHelper::Toolbar::Basic
2-
button_group('miq_ae_tools_vmdb', [
3-
button(
4-
:ae_copy_simulate,
5-
'fa fa-files-o fa-lg',
6-
N_('Copy object details for use in a Button'),
7-
N_('Copy'),
8-
:url => "resolve",
9-
:url_parms => "?button=copy",
10-
:klass => ApplicationHelper::Button::AeCopySimulate),
11-
])
122
end

app/views/shared/buttons/_ab_form.html.haml

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,4 @@
11
#ab_form
2-
#policy_bar
3-
- if session[:resolve_object].present?
4-
- copied_target_class = session[:resolve_object][:new][:target_class]
5-
- current_target_class = @edit[:new][:target_class]
6-
- if copied_target_class == current_target_class
7-
= link_to({:action => "resolve", :button => "paste"},
8-
"data-miq_sparkle_on" => true,
9-
"data-miq_sparkle_off" => true,
10-
:remote => true,
11-
"data-method" => :post,
12-
:class => 'btn btn-default',
13-
:title => _("Paste object details for use in a Button.")) do
14-
%i.fa.fa-clipboard
15-
- else
16-
%button.btn.btn-default.disabled{:title => _("Paste is not available, target class differs from the target class of the object copied from the Simulation screen")}
17-
%i.fa.fa-clipboard
18-
- else
19-
%button.btn.btn-default.disabled{:title => _("Paste is not available, no object information has been copied from the Simulation screen")}
20-
%i.fa.fa-clipboard
21-
= render :partial => "layouts/flash_msg"
22-
232
#custom_button_tabs
243
%ul.nav.nav-tabs{'role' => 'tablist'}
254
= miq_tab_header('ab_options_tab', @sb[:active_tab]) do

spec/helpers/application_helper/buttons/ae_copy_simulate_spec.rb

Lines changed: 0 additions & 17 deletions
This file was deleted.

spec/views/shared/buttons/_ab_form.html.haml_spec.rb

Lines changed: 0 additions & 30 deletions
This file was deleted.

0 commit comments

Comments
 (0)