From 9c0e098213a3fd0dab5bb8778fb730aca088f9e2 Mon Sep 17 00:00:00 2001
From: luxagraf <sng@luxagraf.net>
Date: Tue, 8 Jul 2014 11:17:12 -0400
Subject: fixed some url related bugs

---
 app/blog/urls.py  | 4 ++--
 app/blog/views.py | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'app/blog')

diff --git a/app/blog/urls.py b/app/blog/urls.py
index 0ac8870..f792527 100644
--- a/app/blog/urls.py
+++ b/app/blog/urls.py
@@ -16,6 +16,6 @@ urlpatterns = patterns('',
     #url(r'(?P<year>\d{4})/$', 'blog.views.date_list', name="blog_by_year"),
     (r'(?P<slug>[-\w]+)/(?P<page>\d+)/$', 'blog.views.entry_list_by_area'),
     (r'(?P<page>\d+)/$', 'blog.views.entry_list'),
-    url(r'(?P<slug>[-\w]+)/$', RedirectView.as_view(url="/writing/%(slug)s/1/")),
-    #url(r'', RedirectView.as_view(url="/writing/1/")),
+    url(r'(?P<slug>[-\w]+)/$', RedirectView.as_view(url="/jrnl/%(slug)s/1/")),
+    url(r'', RedirectView.as_view(url="/jrnl/1/")),
 )
diff --git a/app/blog/views.py b/app/blog/views.py
index b82a2ab..34402b0 100644
--- a/app/blog/views.py
+++ b/app/blog/views.py
@@ -42,7 +42,7 @@ class BlogEntryListView(ListView):
 
 
 def entry_list(request, page):
-    request.page_url = '/writing/%d/'
+    request.page_url = '/jrnl/%d/'
     request.page = int(page)
     try:
         is_build = request.POST['builder']
@@ -61,7 +61,7 @@ def entry_list(request, page):
 
 def entry_list_by_area(request, slug, page):
     """ Grabs entries by region or country"""
-    request.page_url = '/writing/' + slug + '/%d/'
+    request.page_url = '/jrnl/' + slug + '/%d/'
     request.page = int(page)
     try:
         region = Region.objects.get(slug__exact=slug)
-- 
cgit v1.2.3