fixing note url generation when there is no slug set

diff --git a/karmaworld/apps/notes/models.py b/karmaworld/apps/notes/models.py
index 21f0441d99eed9a383f6994d80de8211cc323479..7b1f0b3c7d3a0bf0bfaba1cb58d332dd0455451a 100644 (file)
--- a/karmaworld/apps/notes/models.py
+++ b/karmaworld/apps/notes/models.py
@@ -68,9 +68,12 @@ class Note(models.Model):
 
     def get_absolute_url(self):
         """ Resolve note url, use 'note' route and slug if slug
-            otherwise use note and id
+            otherwise use note.id
         """
-        return u"/{0}/{1}/{2}".format(self.course.school.slug, self.course.slug, self.slug)
+        if self.slug == None:
+            return u"/{0}/{1}/{2}".format(self.course.school.slug, self.course.slug, self.slug)
+        else:
+            return u"/{0}/{1}/{2}".format(self.course.school.slug, self.course.slug, self.id)
 
 
 # FIXME: replace the following GOOGLE_USER in a settings.py

diff --git a/karmaworld/urls.py b/karmaworld/urls.py
index b41cbaa39aed9e26fed7d6fa41abc853c7abfa00..ce561832fe61757915a9f8e45e93dc8f396cf7c5 100644 (file)
--- a/karmaworld/urls.py
+++ b/karmaworld/urls.py
@@ -24,6 +24,10 @@ urlpatterns = patterns('',
     url(r'^raw/(?P<pk>\d+)$', raw_file, name='note_raw'),
     url(r'^(?P<school_slug>[^/]+)/(?P<slug>[^/]+)$', \
         CourseDetailView.as_view(), name='course_detail'),
+    # note file as id
+    url(r'^(?P<school_slug>[^/]+)/(?P<course_slug>[^/]+)/(?P<pk>[\d^/]+)$', \
+        NoteDetailView.as_view(), name='note_detail'),
+    # note file by note.slug
     url(r'^(?P<school_slug>[^/]+)/(?P<course_slug>[^/]+)/(?P<slug>[^/]+)$', \
         NoteDetailView.as_view(), name='note_detail'),