Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Show additional fields for dynamic fields #1199

Merged
merged 1 commit into from
May 2, 2017
Merged

Show additional fields for dynamic fields #1199

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 15 additions & 9 deletions app/views/miq_ae_customization/_dialog_field_form.html.haml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,14 +64,14 @@
= 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')
.col-md-8
= check_box_tag('field_trigger_auto_refresh', '1',
@edit[:field_trigger_auto_refresh],
'data-miq_observe_checkbox' => {:url => url}.to_json)

.form-group
%label.col-md-2.control-label
= _('Auto Refresh other fields when modified')
.col-md-8
= check_box_tag('field_trigger_auto_refresh', '1',
@edit[:field_trigger_auto_refresh],
'data-miq_observe_checkbox' => {:url => url}.to_json)

- if @edit[:field_typ] =~ /Radio/ && !@edit[:field_dynamic]
= render :partial => 'field_values', :locals => {:entry => nil}
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
87 changes: 87 additions & 0 deletions app/views/miq_ae_customization/_dialog_field_form_dynamic_options.html.haml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,4 +28,91 @@
= check_box_tag('field_auto_refresh', '1',
@edit[:field_auto_refresh],
'data-miq_observe_checkbox' => {:url => url}.to_json)
.form-group
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This one stands out to me, but a lot of these .form-groups are duplicated now, right? Should we maybe be looking at separating them into their own partials in the future so that we don't accidentally forget to change both places?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@eclarizio i agree, and I have that on my mind to refactor this, so in future we don't have to maintain these fields in 2 places.

%label.col-md-2.control-label
= _('Auto Refresh other fields when modified')
.col-md-8
= check_box_tag('field_trigger_auto_refresh', '1',
@edit[:field_trigger_auto_refresh],
'data-miq_observe_checkbox' => {:url => url}.to_json)

- if @edit[:field_typ].include?('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)
- if @edit[:field_typ] =~ /Text|Check/
.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
= _('Required')
.col-md-8
= select_tag('field_required',
options_for_select([[_("True"), true], [_("False"), false]], @edit[:field_required].to_s),
"data-miq_sparkle_on" => true,
:class => "selectpicker")
:javascript
miqSelectPickerEvent('field_required', "#{url}")
.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}")
- elsif %w(DialogFieldDateControl DialogFieldDateTimeControl).include?(@edit[:field_typ])
.form-group
%label.col-md-2.control-label
= _('Show Past Dates')
.col-md-8
= check_box_tag("field_past_dates", "1",
@edit[:field_past_dates],
"data-miq_observe_checkbox" => {:url => url}.to_json)
59 changes: 59 additions & 0 deletions app/views/miq_ae_customization/_dialog_field_form_overridable_dynamic_options.html.haml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,59 @@
.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_typ] =~ /TextArea/
= text_area_tag("field_default_value",
@edit[:field_default_value],
"data-miq_observe" => {:interval => '.5', :url => url}.to_json,
:maxlength => 8196,
:size => "50x6")
- elsif @edit[:field_typ] =~ /TextBox/
- 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)
- else
= check_box_tag("field_default_value", "1",
@edit[:field_default_value],
"data-miq_observe_checkbox" => {:url => url}.to_json)