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

Add missing focal point fields migration for django>=1.7. #664

Closed
wants to merge 1 commit into from

Conversation

RoPP
Copy link

@RoPP RoPP commented Oct 1, 2014

No description provided.

@kaedroho
Copy link
Contributor

kaedroho commented Oct 2, 2014

Hi @RoPP Thanks!

When we added Django 1.7 support, we squashed all our south migrations into the initial migration so these fields should be added here: https://github.com/torchbox/wagtail/blob/master/wagtail/wagtailimages/migrations/0001_initial.py#L39-L42

@gasman
Copy link
Collaborator

gasman commented Oct 2, 2014

@kaedroho It looks like Django 1.7 wants another migration as a result of adding blank=True in 807aa1e, even though this shouldn't make any difference at the database level - I also saw this one coming up when I ran makemigrations for 7a2394c.

@RoPP
Copy link
Author

RoPP commented Oct 2, 2014

@kaedroho I had not noticed that all migrations go in 0001_initial but it should be good now.

@gasman
Copy link
Collaborator

gasman commented Oct 2, 2014

@RoPP Sorry, I think there have been some crossed wires here!

The original commit was good - @kaedroho wasn't asking for it to be merged into 0001_initial (since that would defeat the object of having migrations in the first place - people upgrading Wagtail wouldn't get the update). He was just pointing out that these fields appeared to be in place already (which is true, but the new migration was updating them, not adding them). No worries, I'll sort this :-)

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

3 participants