Enable admins to activate users #3015
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
|
|
👏 |
| @@ -132,6 +133,11 @@ def is_activated(self): | |||
|
|
|||
| return False | |||
|
|
|||
| def activate(self, request): | |||
| """Activate the user by deleting any activation they have.""" | |||
| request.db.delete(self.activation) | |||
There was a problem hiding this comment.
This is probably better done as:
session = sa.orm.object_session(self)
session.delete(self.activation)There was a problem hiding this comment.
Although we need request anyway to send the notification, but see below...
|
Looks good, although I don't think moving the triggering of the |
seanh
force-pushed
the
b9PFMDM7-add-activate-button-to-admin-users-page
branch
2 times, most recently
from
73e1617
to
71714a0
Compare
Add an "Activate" button next to users on the /admin/users page so that admins can activate user accounts. Some refactoring to avoid code duplication between activating by users clicking on an activation link and admins clicking the new activate button: move the code that actually activates the user onto the User model where both views can call it.
seanh
force-pushed
the
b9PFMDM7-add-activate-button-to-admin-users-page
branch
from
71714a0
to
cff6f6d
Compare
|
Ok, this is done again |
|
Looks fab. Sorry for the misunderstanding earlier! |
nickstenning
added a commit
that referenced
this pull request
Feb 25, 2016
…-to-admin-users-page Enable admins to activate users
nickstenning
deleted the
b9PFMDM7-add-activate-button-to-admin-users-page
branch
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Add an "Activate" button next to users on the /admin/users page so that
admins can activate user accounts.
Some refactoring to avoid code duplication between activating by users
clicking on an activation link and admins clicking the new activate button:
move the code that actually activates the user onto the User model where
both views can call it.