From 908c4efebe05e2823ac226e4b727b2bf0f9b5137 Mon Sep 17 00:00:00 2001
From: Kenji Okimoto <okimoto@clear-code.com>
Date: Fri, 15 Jun 2018 14:24:39 +0900
Subject: [PATCH] Use local variables instead of instance variables

Signed-off-by: Kenji Okimoto <okimoto@clear-code.com>
---
 .../fluentd/settings/in_tail/_form.html.haml      | 15 ++++-----------
 .../settings/in_tail/after_format.html.haml       |  2 +-
 2 files changed, 5 insertions(+), 12 deletions(-)

diff --git a/app/views/fluentd/settings/in_tail/_form.html.haml b/app/views/fluentd/settings/in_tail/_form.html.haml
index d93184e..93f4c31 100644
--- a/app/views/fluentd/settings/in_tail/_form.html.haml
+++ b/app/views/fluentd/settings/in_tail/_form.html.haml
@@ -1,4 +1,4 @@
-- @setting.errors.full_messages.each do |e|
+- setting.errors.full_messages.each do |e|
   .alert.alert-danger= e
 
 .form-group
@@ -9,16 +9,9 @@
   = f.label :parse_type
   = f.hidden_field :parse_type
   = f.text_field :parse_type, class: "form-control", disabled: true
-- if @setting.known_formats[@setting.parse_type&.to_sym || "syslog"]
-  - @setting.known_formats[@setting.parse_type&.to_sym || "syslog"].each do |key|
-    %label= key
-    = f.hidden_field key
-    = @setting.send(key)
-    %br
-- else
-  %label= @setting.parse_type
-  = f.hidden_field :regexp
-  = @setting.regexp
+%label= setting.parse_type
+= f.hidden_field :regexp
+= setting.regexp
 .form-group
   = f.label :tag
   = f.text_field :tag, class: "form-control"
diff --git a/app/views/fluentd/settings/in_tail/after_format.html.haml b/app/views/fluentd/settings/in_tail/after_format.html.haml
index 4c521ff..13ee2dc 100644
--- a/app/views/fluentd/settings/in_tail/after_format.html.haml
+++ b/app/views/fluentd/settings/in_tail/after_format.html.haml
@@ -3,7 +3,7 @@
 = link_to t('fluentd.settings.in_tail.restart_from_first'), daemon_setting_in_tail_path(@fluentds)
 
 = form_for(@setting, as: "setting", url: confirm_daemon_setting_in_tail_path(@fluentd)) do |f|
-  = render partial: "form", locals: { f: f }
+  = render partial: "form", locals: { f: f, setting: @setting }
 
   %p
     = f.submit t('terms.next'), class: "btn btn-lg btn-primary float-right"