diff options
Diffstat (limited to 'bn_django')
| -rw-r--r-- | bn_django/journal/models.py | 2 | ||||
| -rw-r--r-- | bn_django/urls.py.example | 5 |
2 files changed, 6 insertions, 1 deletions
diff --git a/bn_django/journal/models.py b/bn_django/journal/models.py index 20107c9..a4402b2 100644 --- a/bn_django/journal/models.py +++ b/bn_django/journal/models.py @@ -47,7 +47,7 @@ class MicroEntry(JournalCommon): text_content = models.TextField("text version of content", blank=True,null=True) def __unicode__(self): - self.text_content[:50] + return self.html_content[:50] def get_absolute_url(self): return "/journal/microentries/%s/"%self.id diff --git a/bn_django/urls.py.example b/bn_django/urls.py.example index aa9e079..c175624 100644 --- a/bn_django/urls.py.example +++ b/bn_django/urls.py.example @@ -40,6 +40,11 @@ urlpatterns = patterns('', (r'^admin/(.*)', admin.site.root), (r'^comments/', include('django.contrib.comments.urls')), + (r'^journal/', include('bn_django.journal.urls')), + (r'^artifacts/$', 'django.views.generic.simple.direct_to_template', + {'template': 'journal/artifacts.html'}), + (r'^artifacts/', include('bn_django.journal.artifact_urls')), + # uncomment for development #(r'^static/(?P<path>.*)$', 'django.views.static.serve', # {'document_root': '/home/bnewbold/code/bn-project/static', |