From 16703487cbf54d4cbd2a178e059e0d1f7ee72128 Mon Sep 17 00:00:00 2001
From: Michiel Scholten <michiel@diginaut.net>
Date: Mon, 25 Jul 2016 12:52:13 +0200
Subject: [PATCH] Bug fixes :)

---
 digimarks.py | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/digimarks.py b/digimarks.py
index 39b1a16..93b32b0 100644
--- a/digimarks.py
+++ b/digimarks.py
@@ -301,7 +301,7 @@ def addingbookmark(userkey):
         bookmark = updatebookmark(userkey, request)
         if type(bookmark).__name__ == 'Response':
             return bookmark
-        all_tags[user.key] = get_tags_for_user(user.key)
+        all_tags[userkey] = get_tags_for_user(userkey)
         return redirect(url_for('editbookmark', userkey=userkey, urlhash=bookmark.url_hash))
     return redirect(url_for('add'))
 
@@ -312,7 +312,7 @@ def editingbookmark(userkey, urlhash):
 
     if request.method == 'POST':
         bookmark = updatebookmark(userkey, request, urlhash=urlhash)
-        all_tags[user.key] = get_tags_for_user(user.key)
+        all_tags[userkey] = get_tags_for_user(userkey)
         return redirect(url_for('editbookmark', userkey=userkey, urlhash=bookmark.url_hash))
     return redirect(url_for('add'))
 
@@ -322,7 +322,7 @@ def deletingbookmark(userkey, urlhash):
     """ Delete the bookmark from form submit by <urlhash>/delete """
     Bookmark.delete().where(Bookmark.userkey==userkey, Bookmark.url_hash==urlhash)
     message = 'Bookmark deleted'
-    all_tags[user.key] = get_tags_for_user(user.key)
+    all_tags[userkey] = get_tags_for_user(userkey)
     return redirect(url_for('bookmarks', userkey=userkey, message=message))
 
 
@@ -365,7 +365,10 @@ def publictag(tagkey):
 @app.route('/<userkey>/<tag>/makepublic', methods=['GET', 'POST'])
 def addpublictag(userkey, tag):
     #user = get_object_or_404(User.get(User.key == userkey))
-    user = User.get(User.key == userkey)
+    try:
+        User.get(User.key == userkey)
+    except User.DoesNotExist:
+        abort(404)
     try:
         publictag = PublicTag.get(PublicTag.userkey == userkey, PublicTag.tag == tag)
     except PublicTag.DoesNotExist: