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 request to formfield_for_dbfield signature; fix #260 #261

Merged
merged 1 commit into from Oct 18, 2019

Conversation

Rikuoja
Copy link
Contributor

@Rikuoja Rikuoja commented Oct 14, 2019

No description provided.

@Gagaro
Copy link
Member

Gagaro commented Oct 14, 2019

Hi, thanks for the PR.

For backward compatibility, the signature should probably be (self, db_field, request=None, **kwargs).

I'm not sure why but travis was disabled for this repository. Could you add a line in the CHANGES file and commit/push again so it triggers it.

Thanks 👍

@Gagaro
Copy link
Member

Gagaro commented Oct 14, 2019

The CI seems to be broken right now: https://travis-ci.org/makinacorpus/django-leaflet/builds/597613725

@Rikuoja
Copy link
Contributor Author

Rikuoja commented Oct 15, 2019

Hi, thanks for the PR.

For backward compatibility, the signature should probably be (self, db_field, request=None, **kwargs).

I'm not sure why but travis was disabled for this repository. Could you add a line in the CHANGES file and commit/push again so it triggers it.

Fixed the signature.

Travis seems to have changed some postgres and postgis package names lately, so we've had to update them to new versions to fix the CI: City-of-Helsinki/linkedevents@a71c546#diff-354f30a63fb0907d4ad57269548329e3

@Gagaro
Copy link
Member

Gagaro commented Oct 15, 2019

I fixed travis (https://travis-ci.org/makinacorpus/django-leaflet), could you rebase on master, thanks.

@Rikuoja
Copy link
Contributor Author

Rikuoja commented Oct 18, 2019

Rebase done! 👍

@Gagaro
Copy link
Member

Gagaro commented Oct 18, 2019

Thanks 👍

@Gagaro Gagaro merged commit c06ca37 into makinacorpus:master Oct 18, 2019
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