Fix mentor's comment in controller

parent 1a0017dc
Pipeline #915 failed with stages
in 0 seconds
class UsersController < ApplicationController
before_action :signed_in_user, only: [:update, :my_page, :my_info]
def my_page
@user = current_user
end
def my_info
@user = current_user
end
def update
@user = current_user
if BCrypt::Password.new(@user.password_digest) != change_password[:oldpassword]
if BCrypt::Password.new(current_user.password_digest) != condition_update[:oldpassword]
flash.now[:danger] = 'Old Password is mismatch'
else
if @user.update_attributes(user_params)
if current_user.update_attributes(user_params)
flash[:success] = 'Updated Successfully'
redirect_to my_page_path
else
......@@ -34,10 +31,10 @@ class UsersController < ApplicationController
end
def user_params
params.require(:user).permit(:name, :email, :cv_user, :password)
params.require(:user).permit(:name, :email, :cv_user)
end
def change_password
def condition_update
params.require(:user).permit(:oldpassword)
end
end
<%= render 'layouts/flash' %>
<% if @user.errors.any? %>
<% if current_user.errors.any? %>
<div id="error_explanation">
<div class="alert alert-danger">
The form contains <%= pluralize(@user.errors.count, "error") %>.
The form contains <%= pluralize(current_user.errors.count, "error") %>.
</div>
<ul>
<% @user.errors.full_messages.each do |value| %>
<% current_user.errors.full_messages.each do |value| %>
<li><%= value %></li>
<% end %>
</ul>
......
......@@ -3,10 +3,9 @@
<div class="form-login">
<div class="row form d-flex justify-content-center">
<%= form_for(@user, remote: true) do |f| %>
<%= form_for(current_user, remote: true) do |f| %>
<div class="validation"></div>
<div class="email-field">
<div class="col-4-sm">
<%= f.label :email %>
......
......@@ -3,10 +3,10 @@
<h1 class="text-center my-page-label">My Page</h1>
<div class="form-login">
<div class="row form d-flex justify-content-center">
<%= form_for(@user) do |f| %>
<%= form_for(current_user) do |f| %>
<div class="email-field">
<div class="col-4-sm">
<%= f.label :email %>:
<%= f.label :email %>
</div>
<div class="col-8-sm">
<%= f.text_field :email, class: 'input-email' %>
......@@ -14,7 +14,7 @@
</div>
<div class="name-field">
<div class="col-4-sm">
<%= f.label :name, 'Full Name' %>:
<%= f.label :name, 'Full Name' %>
</div>
<div class="col-8-sm">
<%= f.text_field :name, class: 'input-name' %>
......@@ -22,10 +22,10 @@
</div>
<div class="cv-field">
<div class="col-4-sm">
<%= f.label :cv_user, 'My CV' %>:
<%= f.label :cv_user, 'My CV' %>
</div>
<div class="col-8-sm">
<%= link_to @user.cv_user.identifier, @user.cv_user.url, download: @user.cv_user.identifier %>
<%= link_to current_user.cv_user.identifier, current_user.cv_user.url, download: current_user.cv_user.identifier %>
</div>
</div>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment