Skip to content

bug_fix #7

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

Open
DaichiSaito wants to merge 3 commits into
base: bug
Choose a base branch
from
Open

bug_fix #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
01ad336
bug_fix
MiyazakiAkari Apr 23, 2023
a96031d
bug_fix
MiyazakiAkari Apr 24, 2023
ff4d1ee
bug_fix
MiyazakiAkari Apr 24, 2023
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
2 changes: 1 addition & 1 deletion app/controllers/application_controller.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
class ApplicationController < ActionController::Base

def current_user
@current_user ||= User.find_by(id: session[:id]) if session[:user_id].present?
@current_user ||= User.find_by(id: session[:user_id]) if session[:user_id].present?
end

helper_method :current_user
Expand Down
4 changes: 2 additions & 2 deletions app/controllers/sessions_controller.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ class SessionsController < ApplicationController
def new; end

def create
user = User.find_by(email: params[:email])
if user&.authenticate(params[:password])
user = User.find_by(email: params[:session][:email])
if user && user.authenticate(params[:session][:password])
session[:user_id] = user.id
redirect_to posts_path, notice: 'ログインしました'
else
Expand Down
2 changes: 1 addition & 1 deletion app/views/posts/_form.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@

<div>
<%= form.label :title, style: "display: block" %>
<%= form.text_field :titlee %>
<%= form.text_field :title %>
</div>

<div>
Expand Down