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

Fixed #24467. Always include prepopulate.js to avoid JS errors #4297

Closed
wants to merge 2 commits into from
Closed

Fixed #24467. Always include prepopulate.js to avoid JS errors #4297

wants to merge 2 commits into from

Conversation

1st
Copy link
Contributor

@1st 1st commented Mar 11, 2015

As I mentioned in https://code.djangoproject.com/ticket/24467 - we need to include "prepopulate.js" file always.

This bug is in Django 1.7.5 and maybe in older releases. I use 1.7.5 and fixed this bug in development branch. If I need to do this fix in other branch (for example 1.7.x) please assist me on this way.

Thank you.
Anton

@timgraham
Copy link
Member

buildbot, test this please.

@timgraham
Copy link
Member

As Simon suggested on IRC, we could make the same change for actions.js since there's a similar get_actions() method.

@1st
Copy link
Contributor Author

1st commented Mar 11, 2015

@timgraham OK, will make appropriate change and update this PR

@timgraham
Copy link
Member

buildbot, test this please.

@timgraham
Copy link
Member

merged in 28e8c54, thanks!

@timgraham timgraham closed this Mar 12, 2015
@1st
Copy link
Contributor Author

1st commented Mar 12, 2015

I see message "This pull request is closed, but the 1st:ticket_24467 branch has unmerged commits".

Do I need to press button "Delete branch"?

@timgraham
Copy link
Member

Sure, you can do that. That just deletes the branch on your fork.

@1st
Copy link
Contributor Author

1st commented Mar 12, 2015

@timgraham I can't find in what branch did you merge my change. I can't find it in master :-(

@timgraham
Copy link
Member

master, please see my comment above for the commit hash.

@1st
Copy link
Contributor Author

1st commented Mar 12, 2015

OK, I see. It's not synced changes in my local repo. Sorry.

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.

2 participants