diff options
Diffstat (limited to 'app')
-rw-r--r-- | app/figments/admin.py | 2 | ||||
-rw-r--r-- | app/guide/models.py | 2 | ||||
-rw-r--r-- | app/jrnl/__init__.py (renamed from app/blog/__init__.py) | 0 | ||||
-rw-r--r-- | app/jrnl/admin.py (renamed from app/blog/admin.py) | 0 | ||||
-rw-r--r-- | app/jrnl/fields.py (renamed from app/blog/fields.py) | 0 | ||||
-rw-r--r-- | app/jrnl/models.py (renamed from app/blog/models.py) | 4 | ||||
-rw-r--r-- | app/jrnl/urls.py (renamed from app/blog/urls.py) | 0 | ||||
-rw-r--r-- | app/jrnl/views.py (renamed from app/blog/views.py) | 0 | ||||
-rw-r--r-- | app/jrnl/widgets.py (renamed from app/blog/widgets.py) | 0 | ||||
-rw-r--r-- | app/locations/views.py | 2 | ||||
-rw-r--r-- | app/projects/models/natparks.py | 2 | ||||
-rw-r--r-- | app/src/admin.py | 2 |
12 files changed, 8 insertions, 6 deletions
diff --git a/app/figments/admin.py b/app/figments/admin.py index f5e47a6..4c8127b 100644 --- a/app/figments/admin.py +++ b/app/figments/admin.py @@ -1,6 +1,6 @@ from django.contrib import admin from .models import Figment, Series -from blog.admin import BlogEntryForm +from jrnl.admin import BlogEntryForm class FigmentAdmin(admin.ModelAdmin): diff --git a/app/guide/models.py b/app/guide/models.py index 9df83d3..4108e27 100644 --- a/app/guide/models.py +++ b/app/guide/models.py @@ -9,7 +9,7 @@ from PIL import Image import markdown from taggit.managers import TaggableManager from locations.models import Location -from blog.models import Entry +from jrnl.models import Entry from photos.models import PhotoGallery diff --git a/app/blog/__init__.py b/app/jrnl/__init__.py index e69de29..e69de29 100644 --- a/app/blog/__init__.py +++ b/app/jrnl/__init__.py diff --git a/app/blog/admin.py b/app/jrnl/admin.py index 15a7512..15a7512 100644 --- a/app/blog/admin.py +++ b/app/jrnl/admin.py diff --git a/app/blog/fields.py b/app/jrnl/fields.py index 8df2f5e..8df2f5e 100644 --- a/app/blog/fields.py +++ b/app/jrnl/fields.py diff --git a/app/blog/models.py b/app/jrnl/models.py index 17f9f49..fe7f274 100644 --- a/app/blog/models.py +++ b/app/jrnl/models.py @@ -3,6 +3,7 @@ import os from django.contrib.gis.db import models from django.utils.html import format_html +from django.core.urlresolvers import reverse from django.conf import settings from django.contrib.syndication.views import Feed from django.contrib.sitemaps import Sitemap @@ -92,7 +93,8 @@ class Entry(models.Model): return self.title def get_absolute_url(self): - return "/jrnl/%s/%s" % (self.pub_date.strftime("%Y/%m").lower(), self.slug) + # return "/jrnl/%s/%s" % (self.pub_date.strftime("%Y/%m").lower(), self.slug) + return reverse("jrnl:detail", kwargs={"year": self.pub_date.year, "month": self.pub_date.strftime("%m"), "slug": self.slug}) def get_absolute_url_old(self): return "/%s/%s/" % (self.pub_date.strftime("%Y/%b/%d").lower(), self.slug) diff --git a/app/blog/urls.py b/app/jrnl/urls.py index d8fa395..d8fa395 100644 --- a/app/blog/urls.py +++ b/app/jrnl/urls.py diff --git a/app/blog/views.py b/app/jrnl/views.py index 7dd755b..7dd755b 100644 --- a/app/blog/views.py +++ b/app/jrnl/views.py diff --git a/app/blog/widgets.py b/app/jrnl/widgets.py index 030437b..030437b 100644 --- a/app/blog/widgets.py +++ b/app/jrnl/widgets.py diff --git a/app/locations/views.py b/app/locations/views.py index bd5eb93..12901eb 100644 --- a/app/locations/views.py +++ b/app/locations/views.py @@ -1,6 +1,6 @@ from django.shortcuts import render_to_response from django.template import RequestContext -from blog.models import Entry +from jrnl.models import Entry from locations.models import Country, Region, Route from projects.shortcuts import render_to_geojson diff --git a/app/projects/models/natparks.py b/app/projects/models/natparks.py index 2eee677..608c5c3 100644 --- a/app/projects/models/natparks.py +++ b/app/projects/models/natparks.py @@ -2,7 +2,7 @@ import datetime from PIL import Image from django.contrib.gis.db import models from django.conf import settings -from blog.models import Entry +from jrnl.models import Entry from photos.models import PhotoGallery from locations.models import State diff --git a/app/src/admin.py b/app/src/admin.py index a83dd66..558528d 100644 --- a/app/src/admin.py +++ b/app/src/admin.py @@ -1,6 +1,6 @@ from django.contrib import admin from .models import Topic, Entry, Book -from blog.admin import BlogEntryForm +from jrnl.admin import BlogEntryForm class TopicAdmin(admin.ModelAdmin): prepopulated_fields = {"slug": ('name',), "pluralized_name":('name',)} |