Merge pull request #108 from MyDry/fix/validation-error-message-flash

Revert "Refactor inform_validation_errors helper function"
MYDRY · Oct 12, 2018 · e203441 · e203441
2 parents 5438e1e + 65f4955
commit e203441
Show file tree

Hide file tree

Showing 7 changed files with 22 additions and 13 deletions.
diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
@@ -53,7 +53,7 @@ def edit
   end
 
   def update
-    if @user.update(user_params)
+    if @user.update_attributes(user_params)
       flash[:success] = "更新しました"
       redirect_to @user
     else

diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
@@ -14,14 +14,14 @@ def format_datetime(datetime, type = :datetime)
     datetime.strftime(format)
   end
 
-  def inform_validation_errors(obj)
-    content_tag(:p) do
-      obj.errors.full_messages.each do |message|
-        concat content_tag(:div, class: 'alert alert-danger') do
-          concat content_tag(:a, 'x', data: { dismiss: 'alert' })
-          message
-        end
+  def inform_validation_errror(obj)
+    html_text = ''
+    obj.errors.full_messages.each do |message|
+      html_text += content_tag(:div, class: 'alert alert-danger') do
+        content_tag(:a, 'x', data: { dismiss: 'alert' })
+        message
       end
     end
+    raw(html_text)
   end
 end
diff --git a/app/models/user.rb b/app/models/user.rb
@@ -7,8 +7,9 @@ class User < ApplicationRecord
   #validates :email, {presence: true, uniqueness: true}
   validates :password,
             confirmation: true,
-            presence: { message: 'を入力してください'}
-
+            presence: { message: 'を入力してください'},
+            allow_nil: true
+
   has_many :ideas,  dependent: :destroy
   has_many :topics, dependent: :destroy
   has_many :likes,  dependent: :destroy

diff --git a/app/views/ideas/_form_field.html.erb b/app/views/ideas/_form_field.html.erb
@@ -1,4 +1,6 @@
-<%= inform_validation_errors(idea) %>
+<p>
+  <%= inform_validation_errror(idea) %>
+</p>
 <div class="container">
   <div class="form-group col-xs-4">
     <%= form_for(idea, url: next_path) do |f| %>

diff --git a/app/views/topics/_form_field.html.erb b/app/views/topics/_form_field.html.erb
@@ -1,4 +1,6 @@
-<%= inform_validation_errors(topic) %>
+<p>
+  <%= inform_validation_errror(topic) %>
+</p>
 <div class="container">
   <div class="form-group col-xs-4">
     <%= form_for(topic) do |f| %>

diff --git a/app/views/users/_form_field.html.erb b/app/views/users/_form_field.html.erb
@@ -1,4 +1,6 @@
-<%= inform_validation_errors(user) %>
+<p>
+  <%= inform_validation_errror(user) %>
+</p>
 <div class="container">
   <div class="form-group col-xs-4">
     <%= form_for(user) do |f| %>

diff --git a/config/locales/ja.yml b/config/locales/ja.yml
@@ -7,3 +7,5 @@ ja:
     email: メールアドレス
     password: パスワード
     password_confirmation: パスワード（確認用）
+    title: タイトル
+    body: 本文