From 65f4955195c5bb64f7084cba1f711a621a203621 Mon Sep 17 00:00:00 2001
From: Ryuto Kawano <q111011r@mail.kyutech.jp>
Date: Fri, 12 Oct 2018 09:58:35 +0900
Subject: [PATCH] Fix edit bugs

---
 app/controllers/users_controller.rb | 2 +-
 app/models/user.rb                  | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index 2cd6f369..326d9bba 100644
--- 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/models/user.rb b/app/models/user.rb
index 8d541dc8..585d0f1d 100644
--- 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