summaryrefslogtreecommitdiff
path: root/public
diff options
context:
space:
mode:
authorLuke Shumaker <lukeshu@sbcglobal.net>2015-08-05 23:59:03 -0600
committerLuke Shumaker <lukeshu@sbcglobal.net>2015-08-05 23:59:03 -0600
commitd4731a373ca665d4547eb0e89cdf270d41c44243 (patch)
tree41dbfb57e5f6745ad6ac3acd5de8c4d9788c950c /public
parentc8d979b8a48805d162ab46cdc4e493da0aa1595c (diff)
parent803ba89841468bcf088ea79ea981a849ca159682 (diff)
Merge branch 'archweb' into archweb-generic
Diffstat (limited to 'public')
-rw-r--r--public/tests.py8
-rw-r--r--public/views.py2
2 files changed, 6 insertions, 4 deletions
diff --git a/public/tests.py b/public/tests.py
index 565d57ec..aaf5f847 100644
--- a/public/tests.py
+++ b/public/tests.py
@@ -19,13 +19,13 @@ class PublicTest(TestCase):
response = self.client.get('/svn/')
self.assertEqual(response.status_code, 200)
- def test_developers(self):
+ def test_developers_old(self):
response = self.client.get('/developers/')
- self.assertEqual(response.status_code, 200)
+ self.assertEqual(response.status_code, 301)
- def test_fellows(self):
+ def test_fellows_old(self):
response = self.client.get('/fellows/')
- self.assertEqual(response.status_code, 200)
+ self.assertEqual(response.status_code, 301)
def test_donate(self):
response = self.client.get('/donate/')
diff --git a/public/views.py b/public/views.py
index 7dd0528c..910b6c2d 100644
--- a/public/views.py
+++ b/public/views.py
@@ -25,10 +25,12 @@ def index(request):
else:
def updates():
return get_recent_updates()
+ domain = "%s://%s" % (request.scheme, request.META.get('HTTP_HOST'))
context = {
'news_updates': News.objects.order_by('-postdate', '-id')[:15],
'pkg_updates': updates,
'staff_groups': StaffGroup.objects.all(),
+ 'domain': domain,
}
return render(request, 'public/index.html', context)