Migration to django-popolo part 2#1195
Merged
mhl merged 6 commits intoreviewed-migrate-to-django-popolofrom Sep 23, 2016
Merged
Migration to django-popolo part 2#1195mhl merged 6 commits intoreviewed-migrate-to-django-popolofrom
mhl merged 6 commits intoreviewed-migrate-to-django-popolofrom
Conversation
mhl
commented
Sep 23, 2016
| field=models.ForeignKey(to='popolo.Person'), | ||
| preserve_default=True, | ||
| ), | ||
| migrations.AlterField( |
Collaborator
Author
There was a problem hiding this comment.
Oops, this AlterField and the next one are spurious - they were accidentally generated by having the old models file present after 1a0c81a and running makemigrations, I'll add a fixup to remove them.
Collaborator
Author
There was a problem hiding this comment.
And actually the same spurious AlterFields got into: b6fbffb
chrismytton
approved these changes
Sep 23, 2016
Contributor
chrismytton
left a comment
chrismytton
left a comment
There was a problem hiding this comment.
I've made a small suggestion, but assuming the tests will be fixed in part 3, 👍 🚀
contactos/models.py
Outdated
| contact_type = models.ForeignKey('ContactType') | ||
| person = models.ForeignKey(Person) | ||
| popolo_person = models.ForeignKey(PopoloPerson, null=True, blank=True) | ||
| person = models.ForeignKey(PopoloPerson) |
Contributor
There was a problem hiding this comment.
I think we can import PopoloPerson as Person now that we've removed the reference to the popit.models.Person?
Collaborator
Author
There was a problem hiding this comment.
Good point, I'll do that.
mhl
force-pushed
the
reviewed-migrate-to-django-popolo
branch
from
bc4d6c6 to
60452ec
Compare
mhl
force-pushed
the
migrate-to-django-popolo-part-2
branch
from
03f486d to
b059c76
Compare
mhl
force-pushed
the
migrate-to-django-popolo-part-2
branch
from
b059c76 to
235c993
Compare
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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.
This is the second part of: #1181 for review. See that pull request for the context for this pull request.
This removes the old popit-django model references.