Skip to content

All users will now be added to existing org-appropriate license group… #347

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

Merged
zebulasampedro merged 1 commit into from
Feb 6, 2019
Merged

All users will now be added to existing org-appropriate license group… #347

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions rcamp/accounts/models.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -272,15 +272,15 @@ def create_user_from_request(self,**kwargs):
organization=organization
)

# Add CU users to ucb posix group
if ('ucb' in settings.LICENSE_GROUPS) and (organization == 'ucb'):
license_grp = settings.LICENSE_GROUPS['ucb']
ucb_grps = RcLdapGroup.objects.filter(name=license_grp)
if ucb_grps.count() > 0:
ucb_grp = ucb_grps[0]
# Add users to org-appropriate posix group
if (organization in settings.LICENSE_GROUPS) and (organization == organization):
license_grp = settings.LICENSE_GROUPS[organization]
org_grps = RcLdapGroup.objects.filter(name=license_grp)
if org_grps.count() > 0:
org_grp = org_grps[0]
# TODO: Extend ldapdb ListField to include an append method.
ucb_grp.members = ucb_grp.members + [username]
ucb_grp.save(organization='ucb')
org_grp.members = org_grp.members + [username]
org_grp.save(organization=organization)

return user

Expand Down