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

Pass relative URLs for static files through django.contrib.staticfiles (fixes #111) #114

Merged
merged 4 commits into from
Sep 7, 2015

Conversation

dyve
Copy link
Contributor

@dyve dyve commented Sep 7, 2015

No description provided.

@@ -182,7 +183,8 @@ def _normalize_plugins_config():
# absolute URL or a URL starting at root
pass
else:
urls[i] = urljoin(settings.STATIC_URL, url)
Copy link
Collaborator

Choose a reason for hiding this comment

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

Error on travis: imported but no used :)

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I'll add a new PR
@leplatrem I suggest you add instructions on how to locally run the same test as Travis -- python quicktest.py leaflet --db=postgres (which I had to figure out for myself) passed perfectly. Contributing without knowing the tests is no fun.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Maybe add 'setup.py test' as default test script, it's not hard

@dyve
Copy link
Contributor Author

dyve commented Sep 7, 2015

I removed the obsolete import of url join. Please add instructions to run local tests that will also pass Travis.

leplatrem added a commit that referenced this pull request Sep 7, 2015
Pass relative URLs for static files through django.contrib.staticfiles (fixes #111)
@leplatrem leplatrem merged commit 8d6a18e into makinacorpus:master Sep 7, 2015
@leplatrem
Copy link
Collaborator

I created a dedicated issue for the docs, to prevent blocking the merge of this one :)

Thanks a lot for your patience and contribution :)

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