tFix TODO where story_id is not in database. - diasporadiaries - a platform for writing stories with personal accounts and messages
[h|git clone git://parazyd.org/diasporadiaries.git|URL:git://parazyd.org/diasporadiaries.git|server|port]
[1|Log|/git/diasporadiaries/log.gph|server|port]
[1|Files|/git/diasporadiaries/files.gph|server|port]
[1|Refs|/git/diasporadiaries/refs.gph|server|port]
[1|Submodules|/git/diasporadiaries/file/.gitmodules.gph|server|port]
[1|README|/git/diasporadiaries/file/README.md.gph|server|port]
[1|LICENSE|/git/diasporadiaries/file/LICENSE.gph|server|port]
---
[1|commit 20cf734bb15c556b3a408a0ae821b980d93c8ca0|/git/diasporadiaries/commit/20cf734bb15c556b3a408a0ae821b980d93c8ca0.gph|server|port]
[1|parent 366c8f957d624d7aa0850945d0b21fb9e3e71535|/git/diasporadiaries/commit/366c8f957d624d7aa0850945d0b21fb9e3e71535.gph|server|port]
[h|Author: parazyd <parazyd@dyne.org>|URL:mailto:parazyd@dyne.org|server|port]
Date:   Wed, 16 Jan 2019 22:39:01 +0100

Fix TODO where story_id is not in database.

Diffstat:
  M diaspora.py                         |       6 +++---
  M templates/view.html                 |      12 ++++++++++++
  M utils.py                            |       8 ++++++--

3 files changed, 21 insertions(+), 5 deletions(-)
---
[1|diff --git a/diaspora.py b/diaspora.py|/git/diasporadiaries/file/diaspora.py.gph|server|port]
t@@ -72,9 +72,9 @@ def edit():
     Route for editing and redacting.
     """
     if request.method != 'POST':
-        story_id = request.args.get('id')
-        if story_id:
-            return render_template('edit.html', story=get_story(story_id))
+        story = get_story(request.args.get('id'))
+        if story:
+            return render_template('edit.html', story=story)
         return render_template('fail_edit.html')
 
     vals = [
[1|diff --git a/templates/view.html b/templates/view.html|/git/diasporadiaries/file/templates/view.html.gph|server|port]
t@@ -6,6 +6,8 @@
 
   <main role="main" class="container cover">
 
+  {% if story %}
+
   <h1 class="cover-heading">{{ story['name'] }} in {{ story['disembarkname'] }}</h1>
 
   <p>by {{ story['name'] }}, {{ story['date'] }} {{ story['time'] }}</p>
t@@ -16,6 +18,16 @@
   <hr style="width: 100%; height: 2px;">
   <a href="/country?id={{ story['disembark'] }}">&lt; back</a>
 
+  {% else %}
+
+  <h1 class="cover-heading">Error!</h1>
+
+  <p class="lead">No story with this story id.</p>
+
+  <p class="lead">You can return to the <a href="/">homepage</a> now.</p>
+
+  {% endif %}
+
   </main>
 
 {% include 'footer.html' %}
[1|diff --git a/utils.py b/utils.py|/git/diasporadiaries/file/utils.py.gph|server|port]
t@@ -78,8 +78,12 @@ def get_story(story_id):
     """
     Returns a specific story matching the story_id.
     """
-    # TODO: test if story_id isn't in db.
-    return fill_story(sql_select_col_where('*', 'id', story_id)[0])
+    if not story_id:
+        return None
+    res = sql_select_col_where('*', 'id', story_id)
+    if not res:
+        return None
+    return fill_story(res[0])
 
 
 def get_multiple_stories(col, val, reverse=True):