encode/django-rest-framework
1
1
Fork 0
mirror of https://github.com/encode/django-rest-framework.git synced 2025-09-16 09:12:29 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge 687e56b5c9 into 87ef85587d

Browse Source
This commit is contained in:
GitHub Merge Button 2012-02-02 19:30:55 -08:00
commit e3bbdd112b
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
djangorestframework/utils/staticviews.py
View File

@ -62,7 +62,8 @@ def api_login(request, template_name='api_login.html',
redirect_field_name: redirect_to, redirect_field_name: redirect_to,
#'site': current_site, #'site': current_site,
#'site_name': current_site.name, #'site_name': current_site.name,
'ADMIN_MEDIA_PREFIX': settings.ADMIN_MEDIA_PREFIX, 'ADMIN_MEDIA_PREFIX': "%sadmin/" % settings.STATIC_URL if hasattr(settings,"STATIC_URL")
else settings.ADMIN_MEDIA_PREFIX,
}, context_instance=RequestContext(request)) }, context_instance=RequestContext(request))

2
setup.py
View File

@ -24,7 +24,7 @@ setup(
'djangorestframework.runtests', 'djangorestframework.runtests',
'djangorestframework.utils'], 'djangorestframework.utils'],
package_dir={'djangorestframework': 'djangorestframework'}, package_dir={'djangorestframework': 'djangorestframework'},
package_data = {'djangorestframework': ['templates/*', 'static/*']}, package_data = {'djangorestframework': ['templates/*', 'static/*.*', 'static/css/*']},
test_suite = 'djangorestframework.runtests.runcoverage.main', test_suite = 'djangorestframework.runtests.runcoverage.main',
install_requires=['URLObject>=0.6.0'], install_requires=['URLObject>=0.6.0'],
classifiers = [ classifiers = [