Skip to content

Commit 2625ae6

Browse files
committed
Fixes issue with editing substitute value
1 parent 0886359 commit 2625ae6

File tree

1 file changed

+2
-8
lines changed

1 file changed

+2
-8
lines changed

app/controllers/miq_ae_class_controller.rb

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -881,8 +881,6 @@ def fields_form_field_changed
881881
assert_privileges('miq_ae_field_edit')
882882
return unless load_edit("aefields_edit__#{params[:id]}", "replace_cell__explorer")
883883

884-
# byebug
885-
886884
fields_get_form_vars
887885
@changed = (@edit[:new] != @edit[:current])
888886
# render :update do |page|
@@ -1466,7 +1464,6 @@ def field_select
14661464

14671465
# AJAX driven routine to select a classification entry
14681466
def field_accept
1469-
# byebug
14701467
assert_privileges('miq_ae_field_edit')
14711468
fields_get_form_vars
14721469
@changed = (@edit[:new] != @edit[:current])
@@ -1478,7 +1475,6 @@ def field_accept
14781475
# page << javascript_for_miq_button_visibility(@changed)
14791476
# page << "miqSparkle(false);"
14801477
# end
1481-
# byebug
14821478
render :json => {
14831479
:message => 'Accepted',
14841480
:status => 200,
@@ -2370,12 +2366,11 @@ def fields_get_form_vars
23702366
if params[:item].blank? && !%w[accept save].include?(params[:button]) && params["action"] != "field_delete"
23712367
field_data = session[:field_data]
23722368
new_field = @edit[:new_field]
2373-
23742369
field_attributes.each do |field|
23752370
field_name = "field_#{field}".to_sym
23762371
field_sym = field.to_sym
23772372
if field == "substitute"
2378-
field_data[field_sym] = new_field[field_sym] = params[field_name] == "1" if params[field_name]
2373+
field_data[field_sym] = new_field[field_sym] = params[field_name] if params.key?(field_name)
23792374
elsif params[field_name]
23802375
field_data[field_sym] = new_field[field_sym] = params[field_name]
23812376
end
@@ -2394,7 +2389,7 @@ def fields_get_form_vars
23942389
field_attributes.each do |field|
23952390
field_name = "fields_#{field}_#{i}"
23962391
if field == "substitute"
2397-
fld[field] = params[field_name] == "1" if params[field_name]
2392+
fld[field] = params[field_name] if params.key?(field_name)
23982393
elsif %w[aetype datatype].include?(field)
23992394
var_name = "fields_#{field}#{i}"
24002395
fld[field] = params[var_name.to_sym] if params[var_name.to_sym]
@@ -2419,7 +2414,6 @@ def fields_get_form_vars
24192414
end
24202415
new_fields = {}
24212416
field_attributes.each do |field_attribute|
2422-
# byebug
24232417
# new_fields[field_attribute] = @edit[:new_field][field_attribute.to_sym]
24242418
# new_fields[field_attribute] = params[:field][field_attribute.to_sym]
24252419
new_fields[field_attribute] = params[field_attribute.to_sym]

0 commit comments

Comments
 (0)