1
1
require "rexml/document"
2
- require 'byebug'
3
2
class MiqAeClassController < ApplicationController
4
3
include MiqAeClassHelper
5
4
include AutomateTreeHelper
@@ -883,19 +882,11 @@ def fields_form_field_changed
883
882
884
883
fields_get_form_vars
885
884
@changed = ( @edit [ :new ] != @edit [ :current ] )
886
- # render :update do |page|
887
- # page << javascript_prologue
888
885
unless %w[ up down ] . include? ( params [ :button ] )
889
886
if params [ :field_datatype ] == "password"
890
- # page << javascript_hide("field_default_value")
891
- # page << javascript_show("field_password_value")
892
- # page << "$('#field_password_value').val('');"
893
887
session [ :field_data ] [ :default_value ] =
894
888
@edit [ :new_field ] [ :default_value ] = ''
895
889
elsif params [ :field_datatype ]
896
- # page << javascript_hide("field_password_value")
897
- # page << javascript_show("field_default_value")
898
- # page << "$('#field_default_value').val('');"
899
890
session [ :field_data ] [ :default_value ] =
900
891
@edit [ :new_field ] [ :default_value ] = ''
901
892
end
@@ -906,19 +897,11 @@ def fields_form_field_changed
906
897
def_field = "fields_default_value_" << f [ 1 ] . to_s
907
898
pwd_field = "fields_password_value_" << f [ 1 ] . to_s
908
899
if @edit [ :new ] [ :fields ] [ f [ 1 ] . to_i ] [ 'datatype' ] == "password"
909
- # page << javascript_hide(def_field)
910
- # page << javascript_show(pwd_field)
911
- # page << "$('##{pwd_field}').val('');"
912
900
else
913
- # page << javascript_hide(pwd_field)
914
- # page << javascript_show(def_field)
915
- # page << "$('##{def_field}').val('');"
916
901
end
917
902
@edit [ :new ] [ :fields ] [ f [ 1 ] . to_i ] [ 'default_value' ] = nil
918
903
end
919
904
end
920
- # page << javascript_for_miq_button_visibility_changed(@changed)
921
- # end
922
905
render :json => { :message => 'Field updated successfully' } , :status => 200
923
906
end
924
907
@@ -1440,7 +1423,7 @@ def create_namespace
1440
1423
# AJAX driven routine to select a classification entry
1441
1424
def field_select
1442
1425
assert_privileges ( 'miq_ae_field_edit' )
1443
- fields_get_form_vars # nothing in particular handled here
1426
+ fields_get_form_vars
1444
1427
session [ :field_data ] = { }
1445
1428
@edit [ :new_field ] [ :substitute ] = session [ :field_data ] [ :substitute ] = true
1446
1429
render :json => { :status => 200 }
@@ -2368,23 +2351,17 @@ def fields_get_form_vars
2368
2351
end
2369
2352
end
2370
2353
elsif params [ :button ] == "accept"
2371
- # if session[:field_data][:name].blank? || session[:field_data][:aetype].blank?
2372
2354
if params [ :name ] . blank? || params [ :aetype ] . blank?
2373
- # field = session[:field_data][:name].blank? ? "Name" : "Type"
2374
- # field += " and Type" if field == "Name" && session[:field_data][:aetype].blank?
2375
2355
field = params [ :name ] . blank? ? "Name" : "Type"
2376
2356
field += " and Type" if field == "Name" && params [ :aetype ] . blank?
2377
2357
add_flash ( _ ( "%{field} is required" ) % { :field => field } , :error )
2378
2358
return
2379
2359
end
2380
2360
new_fields = { }
2381
2361
field_attributes . each do |field_attribute |
2382
- # new_fields[field_attribute] = @edit[:new_field][field_attribute.to_sym]
2383
- # new_fields[field_attribute] = params[:field][field_attribute.to_sym]
2384
2362
new_fields [ field_attribute ] = params [ field_attribute . to_sym ]
2385
2363
end
2386
2364
@edit [ :new ] [ :fields ] . push ( new_fields )
2387
- # @edit[:new_field] = session[:field_data] = {}
2388
2365
end
2389
2366
end
2390
2367
0 commit comments