Skip to content
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

Jump to bottom

Scottx611x/fix add users to public group timeout #2996

Merged
merged 5 commits into from
Sep 11, 2018
Merged

Scottx611x/fix add users to public group timeout #2996

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
12f53c6
Only add a User to the Public Group if they aren't already a member
scottx611x Sep 11, 2018
400241c
Only add user to neo4j upon initial User creation
scottx611x Sep 11, 2018
8c6407e
Revert "Only add a User to the Public Group if they aren't already a …
scottx611x Sep 11, 2018
0ccd4b9
Constrain User addition and annotatio set updating neo4j to active us…
scottx611x Sep 11, 2018
fb9a68e
Reverse logic to check if a User is active and add logger
scottx611x Sep 11, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 4 additions & 0 deletions refinery/core/models.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1978,6 +1978,10 @@ def save(self, *arg, **kwargs):
def _add_user_to_neo4j(sender, **kwargs):
user = kwargs['instance']

if not user.is_active:
logger.debug("User: %s has not been activated. Not adding them to "
"Neo4J.", user.username)
return
add_or_update_user_to_neo4j(user.id, user.username)
add_read_access_in_neo4j(
map(
Expand Down