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.

Sign up for GitHub

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

Jump to bottom

Use STATIC_URL for badges #4558

Closed
wants to merge 1 commit into from
Closed

Use STATIC_URL for badges #4558

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 4 additions & 5 deletions readthedocs/projects/views/public.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
from django.conf import settings
from django.contrib import messages
from django.contrib.auth.models import User
from django.contrib.staticfiles.templatetags.staticfiles import static
from django.core.cache import cache
from django.core.urlresolvers import reverse
from django.http import Http404, HttpResponse, HttpResponseRedirect
Expand Down Expand Up @@ -121,18 +120,18 @@ def project_badge(request, project_slug):
version = Version.objects.public(request.user).get(
project__slug=project_slug, slug=version_slug)
except Version.DoesNotExist:
url = static(badge_path % 'unknown')
url = settings.STATIC_URL + (badge_path % 'unknown')
return HttpResponseRedirect(url)
version_builds = version.builds.filter(type='html',
state='finished').order_by('-date')
if not version_builds.exists():
url = static(badge_path % 'unknown')
url = settings.STATIC_URL + (badge_path % 'unknown')
return HttpResponseRedirect(url)
last_build = version_builds[0]
if last_build.success:
url = static(badge_path % 'passing')
url = settings.STATIC_URL + (badge_path % 'passing')
else:
url = static(badge_path % 'failing')
url = settings.STATIC_URL + (badge_path % 'failing')
return HttpResponseRedirect(url)


Expand Down
4 changes: 2 additions & 2 deletions readthedocs/rtd_tests/tests/test_project_views.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@

from mock import patch
from django.test import TestCase
from django.conf import settings
from django.contrib.auth.models import User
from django.contrib.staticfiles.templatetags.staticfiles import static
from django.contrib.messages import constants as message_const
from django.core.urlresolvers import reverse
from django.http.response import HttpResponseRedirect
Expand Down Expand Up @@ -426,7 +426,7 @@ class TestBadges(TestCase):

# To set `flat` as default style as done in code.
def get_badge_path(self, version, style='flat'):
return static(self.BADGE_PATH % (version, style))
return settings.STATIC_URL + (self.BADGE_PATH % (version, style))

def setUp(self):
self.BADGE_PATH = 'projects/badges/%s-%s.svg'
Expand Down