From: Charles Connell <charles@connells.org>
Date: Tue, 11 Mar 2014 22:06:03 +0000 (-0400)
Subject: Rollback fix from yesterday
X-Git-Tag: release-20150131~148^2~2
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=8fddc6c47040c345677bfb6f8b729fb973c5654a;p=oweals%2Fkarmaworld.git

Rollback fix from yesterday
---

diff --git a/karmaworld/apps/notes/models.py b/karmaworld/apps/notes/models.py
index 45c4caa..10ab87a 100644
--- a/karmaworld/apps/notes/models.py
+++ b/karmaworld/apps/notes/models.py
@@ -157,10 +157,6 @@ class Document(models.Model):
         """
         Returns the Filepicker URL for reading the upstream document.
         """
-        # Fetch FilepickerFile
-        if not self.fp_file.name:
-            return None
-
         fpf = self._get_fpf()
         # Return proper URL for reading
         return fpf.get_url()
diff --git a/karmaworld/templates/notes/note_detail.html b/karmaworld/templates/notes/note_detail.html
index 52286c3..0f6ac93 100644
--- a/karmaworld/templates/notes/note_detail.html
+++ b/karmaworld/templates/notes/note_detail.html
@@ -116,25 +116,15 @@
                 </a>
               </div>
               <div class="small-4 column">
-                {% if note.get_fp_url %}
-                  <a id="note-download-button" href="{{ note.get_fp_url }}">
-                    <img
-                      src="{{ STATIC_URL }}img/note_download.png"
-                      alt="note_download"
-                      width="51" height="36"
-                      data-ot="It costs 2 karma points to download a note"
-                      {% include 'partial/opentip_settings.html' %}
-                      class="opentip" />
-                  </a>
-                {% else %}
+                <a id="note-download-button" href="{{ note.get_fp_url }}">
                   <img
-                    src="{{ STATIC_URL }}img/note_download_disabled.png"
+                    src="{{ STATIC_URL }}img/note_download.png"
                     alt="note_download"
                     width="51" height="36"
-                    data-ot="Sorry, this note cannot be downloaded"
+                    data-ot="It costs 2 karma points to download a note"
                     {% include 'partial/opentip_settings.html' %}
                     class="opentip" />
-                {% endif %}
+                </a>
               </div>
             {% else %}
               <div class="small-4 column">