updating raw file rendering to class based view #105

diff --git a/karmaworld/apps/notes/views.py b/karmaworld/apps/notes/views.py
index 7a39dbee81e67ffbfec7dba3e559fd007a6b0dc7..9fc83ca80980cf4ad0b9cf778624ff0f0c11a13a 100644 (file)
--- a/karmaworld/apps/notes/views.py
+++ b/karmaworld/apps/notes/views.py
@@ -82,9 +82,3 @@ class RawNoteDetailView(DetailView):
     template_name = u'notes/note_raw.html'
     context_object_name = u"note"
     model = Note
-
-
-def raw_file(request, pk):
-    """ Display the raw html from a Note object for embedding in an iframe """
-    note = get_object_or_404(Note, pk=pk)
-    return HttpResponse(note.html)

diff --git a/karmaworld/templates/notes/note_raw.html b/karmaworld/templates/notes/note_raw.html
index 8ad99fc48696e9a0a127a5d9d919719e10937983..c22220c4cf96ebcafaf86e05d80cde6e2d57c41b 100644 (file)
--- a/karmaworld/templates/notes/note_raw.html
+++ b/karmaworld/templates/notes/note_raw.html
@@ -1 +1,5 @@
-{{ note.html|safe }}
+{% if note.html %}
+  {{ note.html|safe }}
+{% else %}
+  <h2>Error: Note has no html</h2>
+{% endif %}

diff --git a/karmaworld/urls.py b/karmaworld/urls.py
index 60d06e63cff8dbde7147ba62033aa95828e2ecd5..c085e28446ca1d62a467d90367749d681932457e 100644 (file)
--- a/karmaworld/urls.py
+++ b/karmaworld/urls.py
@@ -14,7 +14,7 @@ from karmaworld.apps.courses.views import CourseDetailView
 from karmaworld.apps.courses.views import CourseSaveView
 from karmaworld.apps.courses.views import school_list
 from karmaworld.apps.notes.views import NoteView
-from karmaworld.apps.notes.views import raw_file
+from karmaworld.apps.notes.views import RawNoteDetailView
 
 # See: https://docs.djangoproject.com/en/dev/ref/contrib/admin/#hooking-adminsite-instances-into-your-urlconf
 admin.autodiscover()
@@ -33,7 +33,7 @@ urlpatterns = patterns('',
     url(r'^about/$', AboutView.as_view(), name='about'),
 
     # VIEW for viewing a Note's gdrive generated html, used as iframe
-    url(r'^raw/(?P<pk>\d+)$', raw_file, name='note_raw'),
+    url(r'^raw/(?P<pk>\d+)$', RawNoteDetailView.as_view(), name='note_raw'),
 
     # VIEW for displaying a single Course
     url(r'^(?P<school_slug>[^/]+)/(?P<slug>[-A-Za-z0-9_]+)$', \