Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
V
venjob
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Huỳnh Thiên Phước
venjob
Commits
126a0b48
Commit
126a0b48
authored
Aug 14, 2020
by
Huỳnh Thiên Phước
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix mentor's comment in controller
parent
1a0017dc
Pipeline
#915
failed with stages
in 0 seconds
Changes
5
Pipelines
1
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
13 additions
and
17 deletions
+13
-17
app/controllers/users_controller.rb
+4
-7
app/views/shared/_update_error_messages.html.erb
+3
-3
app/views/users/my_info.html.erb
+1
-2
app/views/users/my_page.html.erb
+5
-5
public/uploads/user/cv_user/1/Document-converted.pdf
+0
-0
No files found.
app/controllers/users_controller.rb
View file @
126a0b48
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
c
hange_password
def
c
ondition_update
params
.
require
(
:user
).
permit
(
:oldpassword
)
end
end
app/views/shared/_update_error_messages.html.erb
View file @
126a0b48
<%=
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>
...
...
app/views/users/my_info.html.erb
View file @
126a0b48
...
...
@@ -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
%>
...
...
app/views/users/my_page.html.erb
View file @
126a0b48
...
...
@@ -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>
...
...
public/uploads/user/cv_user/1/Document-converted.pdf
0 → 100644
View file @
126a0b48
File added
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment