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

Define shadow UserObjectPermission; fixes #2148 #2149

Merged
merged 2 commits into from
Jan 7, 2019

Conversation

jnm
Copy link
Member

@jnm jnm commented Jan 3, 2019

Also removes django-guardian dependency (and its pesky warning!)

Edit: this doesn't work. Or, more accurately, it works only in threads where the shadow models have not been defined yet. (Fixed!)

Also removes django-guardian dependency
@jnm jnm requested a review from noliveleger January 3, 2019 04:07
@@ -85,7 +84,7 @@ pytest==3.0.3 # via pytest-django
python-dateutil==2.6.0
python-digest==1.7
pytz==2016.4
pyxform==0.11.5
pyxform==0.12.0
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

make pip_compile made this change. Seemed fine to me since requirements.txt and dev_requirements.txt already had it.

@jnm jnm added the donotmerge label Jan 3, 2019
...and fix a troublesome `__unicode__()` method copied from django-guardian
@jnm jnm removed the donotmerge label Jan 3, 2019
@noliveleger noliveleger merged commit 50cf706 into master Jan 7, 2019
@noliveleger noliveleger deleted the 2148-remove-related-objects branch January 7, 2019 20:54
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.

None yet

2 participants