Re-disable the HTML sanitize for now

[oweals/karmaworld.git] / karmaworld / apps / notes / views.py

diff --git a/karmaworld/apps/notes/views.py b/karmaworld/apps/notes/views.py
index e9bffc1578db60b8794c1b0d011032f6be4bb118..f1384ced4226d68894c3c0ddea37ec78dde06229 100644 (file)
--- a/karmaworld/apps/notes/views.py
+++ b/karmaworld/apps/notes/views.py
@@ -20,9 +20,7 @@ from karmaworld.apps.notes.forms import NoteForm
 
 
 def is_pdf(self):
-    _path = self.object.note_file.name
-    _, _extension = os.path.splitext(_path)
-    if _extension.lower() == '.pdf':
+    if self.object.file_type == 'pdf':
         return True
     return False
 
@@ -86,6 +84,8 @@ class NoteSaveView(FormView, SingleObjectMixin):
         self.object.year = form.cleaned_data['year']
         # use *arg expansion to pass tags a list of tags
         self.object.tags.add(*form.cleaned_data['tags'])
+        # User has submitted this form, so set the SHOW flag
+        self.object.is_hidden = False
         self.object.save()
         return super(NoteSaveView, self).form_valid(form)
 
@@ -125,11 +125,12 @@ class PDFView(DetailView):
         """ Generate a path to the pdf file associated with this note
             by generating a path to the MEDIA_URL by hand """
 
-        if is_ppt:
+        if is_ppt(self):
             kwargs['pdf_path'] = "{0}{1}".format(settings.MEDIA_URL,
                 os.path.basename(self.object.pdf_file.name))
-        elif is_pdf:
-            kwargs['pdf_path'] = "{0}{1}".format(settings.MEDIA_URL,
-                os.path.basename(self.object.note_file.name))
+        elif is_pdf(self):
+            kwargs['pdf_path'] = self.object.fp_file
+            #kwargs['pdf_path'] = "{0}{1}".format(settings.MEDIA_URL,
+            #    os.path.basename(self.object.note_file.name))
 
         return super(PDFView, self).get_context_data(**kwargs)