Skip to content

Commit

Permalink
Merge pull request #4488 from h-kataria/double_transaction_on_drop_do…
Browse files Browse the repository at this point in the history
…wn_selection_fix

Fixed to use bootstrap select event instead of UJS observer
(cherry picked from commit 44601d4)

Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1618836
  • Loading branch information
Dan Clarizio authored and simaishi committed Sep 13, 2018
1 parent 76a3e1d commit 6e3f4bd
Show file tree
Hide file tree
Showing 2 changed files with 19 additions and 13 deletions.
2 changes: 1 addition & 1 deletion app/controllers/catalog_controller.rb
Original file line number Diff line number Diff line change
Expand Up @@ -1616,7 +1616,7 @@ def st_get_form_vars
@group_changed = false
@edit[:new][:rsc_groups].each_with_index do |groups, i|
groups.each do |g|
if g[:id] == rid
if g[:id].to_i == rid.to_i
@edit[:new][:rsc_groups][val.to_i - 1].push(g)
@edit[:new][:rsc_groups][i].delete(g)
@group_changed = true
Expand Down
30 changes: 18 additions & 12 deletions app/views/catalog/_form_resources_info.html.haml
Original file line number Diff line number Diff line change
Expand Up @@ -65,36 +65,42 @@
- else
= select_tag("gidx_#{to_cid(sr[:id])}",
options_for_select((1..@edit[:new][:rsc_groups].length).to_a, (i + 1).to_s),
"data-miq_sparkle_on" => true,
"data-miq_observe" => {:url => url}.to_json)
"data-miq_sparkle_on" => true)
:javascript
miqSelectPickerEvent('gidx_#{sr[:id]}', '#{url}')
%td
- if @edit[:new][:selected_resources].length <= 1
= h(@edit[:new][:selected_resources].length)
- else
= select_tag("provision_index_#{i}_#{k}",
options_for_select((1..@edit[:new][:provision_order].length).to_a, (sr[:provision_index] + 1).to_s),
"data-miq_sparkle_on" => true,
"data-miq_observe" => {:url => url}.to_json)
"data-miq_sparkle_on" => true)
:javascript
miqSelectPickerEvent('provision_index_#{i}_#{k}', '#{url}')
- start_action_values = [_('Do Nothing'), _('Power On')]
- stop_action_values = [_('Do Nothing'), _('Suspend'), _('Shutdown'), _('Power Off')]
- delay_values = [[_("None"), 0], [1, 1], [2, 2], [3, 3], [4, 4], [5, 5], [10, 10], [20, 20], [30, 30], [40, 40], [50, 50], [60, 60]]
%td
= select_tag("start_action_#{i}_#{k}",
options_for_select(start_action_values, sr[:start_action]),
"data-miq_sparkle_on" => true,
"data-miq_observe" => {:url => url}.to_json)
"data-miq_sparkle_on" => true)
:javascript
miqSelectPickerEvent('start_action_#{i}_#{k}', '#{url}')
%td
= select_tag("stop_action_#{i}_#{k}",
options_for_select(stop_action_values, sr[:stop_action]),
"data-miq_sparkle_on" => true,
"data-miq_observe" => {:url => url}.to_json)
"data-miq_sparkle_on" => true)
:javascript
miqSelectPickerEvent('stop_action_#{i}_#{k}', '#{url}')
%td
= select_tag("start_delay_#{i}_#{k}",
options_for_select(delay_values, (sr[:start_delay] / 60).to_s),
"data-miq_sparkle_on" => true,
"data-miq_observe" => {:url => url}.to_json)
"data-miq_sparkle_on" => true)
:javascript
miqSelectPickerEvent('start_delay_#{i}_#{k}', '#{url}')
%td
= select_tag("stop_delay_#{i}_#{k}",
options_for_select(delay_values, (sr[:stop_delay] / 60).to_s),
"data-miq_sparkle_on" => true,
"data-miq_observe" => {:url => url}.to_json)
"data-miq_sparkle_on" => true)
:javascript
miqSelectPickerEvent('stop_delay_#{i}_#{k}', '#{url}')

0 comments on commit 6e3f4bd

Please sign in to comment.