diginaut/digimarks
1
0
Fork 0
mirror of https://github.com/aquatix/digimarks.git synced 2025-12-07 04:55:10 +01:00
Code Issues Releases Wiki Activity

Catch case where no url was provided. Needs more work

Browse Source
This commit is contained in:
Michiel Scholten
2016-07-31 14:41:23 +02:00
parent 6be78117c2
commit 4bf7af08d5
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
digimarks.py
View File

@@ -259,7 +259,8 @@ def editbookmark(userkey, urlhash):
def addbookmark(userkey): def addbookmark(userkey):
""" Bookmark add form """ """ Bookmark add form """
bookmark = Bookmark(title='', url='', tags='') bookmark = Bookmark(title='', url='', tags='')
return render_template('edit.html', action='Add bookmark', userkey=userkey, bookmark=bookmark, tags=all_tags[userkey]) message = request.args.get('message')
return render_template('edit.html', action='Add bookmark', userkey=userkey, bookmark=bookmark, tags=all_tags[userkey], message=message)
def updatebookmark(userkey, request, urlhash = None): def updatebookmark(userkey, request, urlhash = None):
@@ -282,6 +283,9 @@ def updatebookmark(userkey, request, urlhash = None):
bookmark = Bookmark.get(Bookmark.userkey == userkey, Bookmark.url_hash == urlhash) bookmark = Bookmark.get(Bookmark.userkey == userkey, Bookmark.url_hash == urlhash)
# Editing this bookmark, set modified_date to now # Editing this bookmark, set modified_date to now
bookmark.modified_date = datetime.datetime.now() bookmark.modified_date = datetime.datetime.now()
else:
# No url was supplied, abort. @TODO: raise exception?
return None
bookmark.title = title bookmark.title = title
bookmark.url = url bookmark.url = url
@@ -309,11 +313,13 @@ def addingbookmark(userkey):
if request.method == 'POST': if request.method == 'POST':
bookmark = updatebookmark(userkey, request) bookmark = updatebookmark(userkey, request)
if not bookmark:
return redirect(url_for('addbookmark', userkey=userkey, message='No url provided'), tags=all_tags[userkey])
if type(bookmark).__name__ == 'Response': if type(bookmark).__name__ == 'Response':
return bookmark return bookmark
all_tags[userkey] = get_tags_for_user(userkey) all_tags[userkey] = get_tags_for_user(userkey)
return redirect(url_for('editbookmark', userkey=userkey, urlhash=bookmark.url_hash)) return redirect(url_for('editbookmark', userkey=userkey, urlhash=bookmark.url_hash))
return redirect(url_for('add')) return redirect(url_for('addbookmark'))
@app.route('/<userkey>/<urlhash>/editing', methods=['GET', 'POST']) @app.route('/<userkey>/<urlhash>/editing', methods=['GET', 'POST'])