forked from expo/troggle
[svn] Logbook entries are now at /YYYY-MM-DD/slug .
Try editing a logbook entry title in the admin now. The django built in auto slug field is fun and javascripty. Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8308 by aaron @ 3/16/2009 7:27 PM
This commit is contained in:
@@ -24,6 +24,7 @@ class QMInline(admin.TabularInline):
|
||||
|
||||
#class LogbookEntryAdmin(VersionAdmin):
|
||||
class LogbookEntryAdmin(admin.ModelAdmin):
|
||||
prepopulated_fields = {'slug':("title",)}
|
||||
search_fields = ('title','expedition__year')
|
||||
#inlines = (QMInline,) #doesn't work because QM has two foreignkeys to Logbookentry- need workaround
|
||||
|
||||
|
||||
@@ -10,6 +10,7 @@ import os
|
||||
from django.conf import settings
|
||||
import datetime
|
||||
from decimal import Decimal, getcontext
|
||||
from django.core.urlresolvers import reverse
|
||||
getcontext().prec=2 #use 2 significant figures for decimal calculations
|
||||
|
||||
from models_survex import *
|
||||
@@ -211,6 +212,7 @@ class LogbookEntry(TroggleModel):
|
||||
cave = models.ForeignKey('Cave',blank=True,null=True)
|
||||
place = models.CharField(max_length=100,blank=True,null=True)
|
||||
text = models.TextField()
|
||||
slug = models.SlugField(max_length=100)
|
||||
#href = models.CharField(max_length=100)
|
||||
|
||||
|
||||
@@ -224,7 +226,7 @@ class LogbookEntry(TroggleModel):
|
||||
ordering = ('-date',)
|
||||
|
||||
def get_absolute_url(self):
|
||||
return settings.URL_ROOT + "/logbookentry/" + str(self.pk)
|
||||
return settings.URL_ROOT + reverse('logbookentry',kwargs={'date':self.date,'slug':self.slug})
|
||||
|
||||
def __unicode__(self):
|
||||
return "%s: (%s)" % (self.date, self.title)
|
||||
|
||||
@@ -87,8 +87,8 @@ def newQMlink(logbookentry):
|
||||
nextQMnumber=biggestQMnumber+1
|
||||
return settings.URL_ROOT + r'/admin/expo/qm/add/?' + r'found_by=' + str(logbookentry.pk) +'&number=' + str(nextQMnumber)
|
||||
|
||||
def logbookentry(request, logbookentry_pk):
|
||||
logbookentry = LogbookEntry.objects.get(pk = logbookentry_pk)
|
||||
def logbookentry(request, date, slug):
|
||||
logbookentry = LogbookEntry.objects.get(date=date, slug=slug)
|
||||
|
||||
return render_response(request, 'logbookentry.html', {'logbookentry': logbookentry, 'newQMlink':newQMlink(logbookentry)})
|
||||
|
||||
|
||||
Reference in New Issue
Block a user