diff --git a/app/views/fluentd/settings/in_forward/_form.html.haml b/app/views/fluentd/settings/in_forward/_form.html.haml index e1f00a8..0245f08 100644 --- a/app/views/fluentd/settings/in_forward/_form.html.haml +++ b/app/views/fluentd/settings/in_forward/_form.html.haml @@ -1,18 +1,18 @@ = render "shared/setting_errors" - # NOTE: plugin_setting_form_action_url is defined at SettingConcern -= form_with(model: @setting, scope: "setting", url: plugin_setting_form_action_url(@fluentd), local: true, class: "ignore-rails-error-div", builder: FluentdFormBuilder) do |f| - - @setting.common_options.each do |key| += form_with(model: setting, scope: "setting", url: plugin_setting_form_action_url(fluentd), local: true, class: "ignore-rails-error-div", builder: FluentdFormBuilder) do |f| + - setting.common_options.each do |key| = f.field(key) - = render "shared/vue/transport_section", setting: @setting, form: f + = render "shared/vue/transport_section", setting: setting, form: f .card.card-body.bg-light %h4{"data-toggle" => "collapse", "href" => "#advanced-setting"} = icon('fa-caret-down') = t('terms.advanced_setting') #advanced-setting.collapse - - @setting.advanced_options.each do |key| + - setting.advanced_options.each do |key| = f.field(key) = f.submit t('fluentd.common.finish'), class: "btn btn-lg btn-primary pull-right" diff --git a/app/views/shared/settings/show.html.haml b/app/views/shared/settings/show.html.haml index 89d9f01..1f342ee 100644 --- a/app/views/shared/settings/show.html.haml +++ b/app/views/shared/settings/show.html.haml @@ -6,6 +6,6 @@ = raw t("fluentd.settings.#{target_plugin_name}.option_guide") - if lookup_context.exists?("form", controller.controller_path, true) - = render "#{controller.controller_path}/form" + = render "#{controller.controller_path}/form", setting: @setting, fluentd: @fluentd - else - = render "shared/settings/form" + = render "shared/settings/form", setting: @setting, fluentd: @fluentd