Skip to content

Commit

Permalink
Show additional fields for dynamic fields
Browse files Browse the repository at this point in the history
Made changes to show additional fields for dynamic fields. Additional  field sunder Options box are displayed as well as new box with label "Overridable Options" appears for dynamic fields. More details on these fields are in BZ comment#28(https://bugzilla.redhat.com/show_bug.cgi?id=1431692#c28)

https://bugzilla.redhat.com/show_bug.cgi?id=1431692
  • Loading branch information
h-kataria committed May 1, 2017
1 parent 70ba36c commit e9c25fc
Show file tree
Hide file tree
Showing 3 changed files with 117 additions and 3 deletions.
10 changes: 8 additions & 2 deletions app/views/miq_ae_customization/_dialog_field_form.html.haml
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@
= render :partial => 'dialog_field_form_dynamic_options', :locals => {:url => url}
- else
= render :partial => 'dialog_field_form_non_dynamic_options', :locals => {:url => url}

.form-group
%label.col-md-2.control-label
= _('Auto Refresh other fields when modified')
Expand All @@ -85,10 +85,16 @@
@edit[:field_multi_value],
"data-miq_observe_checkbox" => {:url => url}.to_json)
- unless @edit[:field_dynamic]
= render :partial => 'field_values', :locals => {:entry => nil}
= render :partial => 'field_values', :locals => {:entry => nil}
- elsif @edit[:field_typ] && @edit[:field_typ].include?("TagControl") && @edit[:field_category].present?
= render :partial => 'tag_field_values', :locals => {:entry => nil}

- if @edit[:field_dynamic] == true
%h3
= _('Overridable Options')
.form-horizontal
= render :partial => 'dialog_field_form_overridable_dynamic_options', :locals => {:url => url}

- unless @edit[:field_typ].nil?
%h3
= _('Advanced')
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,4 +28,64 @@
= check_box_tag('field_auto_refresh', '1',
@edit[:field_auto_refresh],
'data-miq_observe_checkbox' => {:url => url}.to_json)

- if @edit[:field_typ] =~ /TextBox/
.form-group
%label.col-md-2.control-label
= _('Value Type')
.col-md-8
= select_tag('field_data_typ',
options_for_select([[_("Integer"), "integer"], [_("String"), "string"]],
@edit[:field_data_typ]),
"data-miq_sparkle_on" => true,
:class => "selectpicker")
:javascript
miqSelectPickerEvent('field_data_typ', "#{url}")
.form-group
%label.col-md-2.control-label
= _('Protected')
.col-md-8
= check_box_tag('field_protected', 'true',
@edit[:field_protected],
"data-miq_observe_checkbox" => {:url => url}.to_json)
.form-group
%label.col-md-2.control-label= _('Required')
.col-md-8
= check_box_tag('field_required', 'true',
@edit[:field_required],
"data-miq_observe_checkbox" => {:url => url}.to_json)
- if %w(DialogFieldTextBox DialogFieldTextAreaBox).include?(@edit[:field_typ])
.form-group
%label.col-md-2.control-label
= _('Validator Type')
.col-md-8
= select_tag('field_validator_type',
options_for_select([[_("None"), nil], [_("Regular Expression"), 'regex']],
@edit[:field_validator_type]),
"data-miq_sparkle_on" => true,
:class => "selectpicker")
:javascript
miqSelectPickerEvent('field_validator_type', "#{url}")
.form-group
%label.col-md-2.control-label
= _('Validator Rule')
.col-md-8
\/
= text_field_tag("field_validator_rule",
@edit[:field_validator_rule],
"data-miq_observe" => {:interval => '.5', :url => url}.to_json,
:disabled => @edit[:field_validator_type].blank?,
:class => "form-control",
:maxlength => 250)
\/
- elsif %w(DialogFieldDropDownList DialogFieldRadioButton).include?(@edit[:field_typ])
.form-group
%label.col-md-2.control-label
= _('Value Type')
.col-md-8
= select_tag('field_data_typ',
options_for_select([[_("Integer"), "integer"], [_("String"), "string"]],
@edit[:field_data_typ]),
"data-miq_sparkle_on" => true,
:class => "selectpicker")
:javascript
miqSelectPickerEvent('field_data_typ', "#{url}")
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
.form-group
%label.col-md-2.control-label
= _('Read only')
.col-md-8
= check_box_tag('field_read_only', '1', @edit[:field_read_only],
"data-miq_observe_checkbox" => {:url => url}.to_json)
.form-group
%label.col-md-2.control-label
= _('Visible')
.col-md-8
= check_box_tag('field_visible', '1',
@edit[:field_visible],
'data-miq_observe_checkbox' => {:url => url}.to_json)
- if %w(DialogFieldDropDownList DialogFieldRadioButton).include?(@edit[:field_typ])
.form-group
%label.col-md-2.control-label
= _('Sort By')
.col-md-8
= select_tag('field_sort_by',
options_for_select([[_("None"), "none"], [_("Description"), "description"], [_("Value"), "value"]], @edit[:field_sort_by]),
:class => "selectpicker")
:javascript
miqSelectPickerEvent('field_sort_by', "#{url}")
- if @edit[:field_sort_by] != "none"
.form-group
%label.col-md-2.control-label
= _('Sort Order')
.col-md-8
= select_tag('field_sort_order',
options_for_select([[_("Ascending"), "ascending"], [_("Descending"), "descending"]], @edit[:field_sort_order]),
:class => "selectpicker")
:javascript
miqSelectPickerEvent('field_sort_order', "#{url}")
- elsif @edit[:field_typ] =~ /Text|Check/
.form-group
%label.col-md-2.control-label
= _('Default Value')
.col-md-8
- if @edit[:field_protected]
= password_field_tag('field_default_value__protected',
@edit[:field_default_value],
'data-miq_observe' => {:interval => '.5', :url => url}.to_json)
- else
= text_field_tag("field_default_value",
@edit[:field_default_value],
"data-miq_observe" => {:interval => '.5', :url => url}.to_json,
:class => "form-control",
:maxlength => 50)

0 comments on commit e9c25fc

Please sign in to comment.