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.

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

Assign users to Public group on signup #150

Merged
merged 1 commit into from
Mar 25, 2021

Conversation

lukehollis
Copy link
Contributor

Now on signup, the form is processed and the new user is assigned to a "Public" group that needs to be created in the admin backend by a superuser.

Should address #94 -- I'll add the buttons for managing collections on the frontend in a separate issue after the Collections data model is adjusted.

@rsinghal
Copy link
Contributor

Please rebase this branch against master to remove 6bcd113 from the list of changes

@lukehollis
Copy link
Contributor Author

@rsinghal I rebased to master--let me know if this is as expected.

@ColeDCrawford
Copy link
Contributor

ColeDCrawford commented Mar 19, 2021

@lukehollis Rashmi can take a look at this on Monday, but I'm still seeing the same modified files as #149 (0004_lesson_summary.py, models.py, lesson-topic-blurb.html). The changes in 0004_lesson_summary.py and models.py are already in master, but the changes to lesson-topic-blurb look new compared to current master. I thought the rebase was going to fix that but I guess not?

@lukehollis
Copy link
Contributor Author

Hi @ColeDCrawford thanks for taking a look, and I followed instructions for what I thought was to rebase master -- I'll branch from master continually in future PRs, and for last weekend, I wanted to make sure that the migrations added were numbered correctly between PRs. Do you have a strategy for this that you prefer?

@rsinghal
Copy link
Contributor

@lukehollis unfortunately, this didn't work as there are now more files changed than before. You would need to rebase against artshumrc giza master, not your own. See https://docs.ansible.com/ansible/latest/dev_guide/developing_rebasing.html. Alternatively, you can resubmit the PR with just the changes for this one. Ultimately, I need to only see the files changed by the PR, not from other PRs, so I can review.

@lukehollis lukehollis force-pushed the feature/user-groups branch from 0b4aaef to 0b46db6 Compare March 24, 2021 18:01
@lukehollis
Copy link
Contributor Author

Hi @rsinghal let me know how this looks--now this PR should only contain the single commit.

@rsinghal
Copy link
Contributor

Yes, this looks right! I'll get this up on dev for the team to test.

@rsinghal rsinghal merged commit e4eba09 into artshumrc:master Mar 25, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants