From 003cb1940761283719ff3b5e1aa788eb769539ae Mon Sep 17 00:00:00 2001 From: Seth Woodworth Date: Mon, 14 Jan 2013 21:16:59 -0500 Subject: [PATCH] modify models.Note.get_absolute_url to generate note urls --- karmaworld/apps/notes/models.py | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/karmaworld/apps/notes/models.py b/karmaworld/apps/notes/models.py index 1198418..fd6cd80 100644 --- a/karmaworld/apps/notes/models.py +++ b/karmaworld/apps/notes/models.py @@ -50,9 +50,11 @@ class Note(models.Model): #course = models.ForeignKey(Course, blank=True, null=True, related_name="files") #school = models.ForeignKey(School, blank=True, null=True) + def __unicode__(self): return u"{0}: {1} -- {2}".format(self.file_type, self.name, self.uploaded_at) + def save(self, *args, **kwargs): """ override built-in save to ensure contextual self.name """ # TODO: If self.name isn't set, generate one based on uploaded_name @@ -62,15 +64,12 @@ class Note(models.Model): self.slug = defaultfilters.slugify(self.name) super(Note, self).save(*args, **kwargs) - @models.permalink + def get_absolute_url(self): """ Resolve note url, use 'note' route and slug if slug otherwise use note and id """ - if self.slug: - return ('note_detail', [unicode(self.slug)]) - else: - return ('note_detail', [self.id]) + return u"/{0}/{1}/{2}".format(self.course.school.slug, self.course.slug, self.slug) # FIXME: replace the following GOOGLE_USER in a settings.py -- 2.25.1