Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in
Toggle navigation
O
OHR Support
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
97
Issues
97
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
Wiki
Wiki
image/svg+xml
Discourse
Discourse
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Projects
OHR Support
Commits
2c67f610
Commit
2c67f610
authored
Mar 10, 2011
by
Stephan Eckardt
Committed by
Eric Davis
Mar 24, 2011
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
replaced auth_source_id.nil? with change_password_allowed? in users controller
parent
8cfe498b
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
4 deletions
+4
-4
users_controller.rb
app/controllers/users_controller.rb
+4
-4
No files found.
app/controllers/users_controller.rb
View file @
2c67f610
...
...
@@ -92,7 +92,7 @@ class UsersController < ApplicationController
@user
.
safe_attributes
=
params
[
:user
]
@user
.
admin
=
params
[
:user
][
:admin
]
||
false
@user
.
login
=
params
[
:user
][
:login
]
@user
.
password
,
@user
.
password_confirmation
=
params
[
:user
][
:password
],
params
[
:user
][
:password_confirmation
]
unless
@user
.
auth_source_id
@user
.
password
,
@user
.
password_confirmation
=
params
[
:user
][
:password
],
params
[
:user
][
:password_confirmation
]
if
@user
.
change_password_allowed?
# TODO: Similar to My#account
@user
.
pref
.
attributes
=
params
[
:pref
]
...
...
@@ -135,10 +135,10 @@ class UsersController < ApplicationController
def
update
@user
.
admin
=
params
[
:user
][
:admin
]
if
params
[
:user
][
:admin
]
@user
.
login
=
params
[
:user
][
:login
]
if
params
[
:user
][
:login
]
if
params
[
:user
][
:password
].
present?
&&
(
@user
.
auth_source_id
.
nil?
||
params
[
:user
][
:auth_source_id
].
blank?
)
@user
.
safe_attributes
=
params
[
:user
]
if
params
[
:user
][
:password
].
present?
&&
@user
.
change_password_allowed?
@user
.
password
,
@user
.
password_confirmation
=
params
[
:user
][
:password
],
params
[
:user
][
:password_confirmation
]
end
@user
.
safe_attributes
=
params
[
:user
]
# Was the account actived ? (do it before User#save clears the change)
was_activated
=
(
@user
.
status_change
==
[
User
::
STATUS_REGISTERED
,
User
::
STATUS_ACTIVE
])
# TODO: Similar to My#account
...
...
@@ -151,7 +151,7 @@ class UsersController < ApplicationController
if
was_activated
Mailer
.
deliver_account_activated
(
@user
)
elsif
@user
.
active?
&&
params
[
:send_information
]
&&
!
params
[
:user
][
:password
].
blank?
&&
@user
.
auth_source_id
.
nil
?
elsif
@user
.
active?
&&
params
[
:send_information
]
&&
!
params
[
:user
][
:password
].
blank?
&&
@user
.
change_password_allowed
?
Mailer
.
deliver_account_information
(
@user
,
params
[
:user
][
:password
])
end
...
...
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