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

Fix for link to public tag page (server part was missing)

Browse Source
This commit is contained in:
Michiel Scholten
2016-08-02 14:35:35 +02:00
parent e7125c07e9
commit 42e4021ef5
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
digimarks.py
View File

@@ -7,7 +7,7 @@ import requests
import shutil import shutil
import bs4 import bs4
from more_itertools import unique_everseen from more_itertools import unique_everseen
from urlparse import urlparse, urlunparse from urlparse import urlparse, urlunparse, urljoin
from utilkit import datetimeutil from utilkit import datetimeutil
@@ -211,6 +211,10 @@ def get_cached_tags(userkey):
return [] return []
def make_external(url):
return urljoin(request.url_root, url)
@app.errorhandler(404) @app.errorhandler(404)
def page_not_found(e): def page_not_found(e):
return render_template('404.html', error=e), 404 return render_template('404.html', error=e), 404
@@ -424,7 +428,7 @@ def publictagfeed(tagkey):
try: try:
this_tag = PublicTag.get(PublicTag.tagkey == tagkey) this_tag = PublicTag.get(PublicTag.tagkey == tagkey)
bookmarks = Bookmark.select().where(Bookmark.userkey == this_tag.userkey, Bookmark.tags.contains(this_tag.tag), Bookmark.status == Bookmark.VISIBLE).limit(15) bookmarks = Bookmark.select().where(Bookmark.userkey == this_tag.userkey, Bookmark.tags.contains(this_tag.tag), Bookmark.status == Bookmark.VISIBLE).limit(15)
feed = AtomFeed(this_tag.tag, feed_url=request.url, url=url_for('publictag', tagkey=tagkey)) feed = AtomFeed(this_tag.tag, feed_url=request.url, url=make_external(url_for('publictag', tagkey=tagkey)))
for bookmark in bookmarks: for bookmark in bookmarks:
updated_date = bookmark.modified_date updated_date = bookmark.modified_date
if not bookmark.modified_date: if not bookmark.modified_date: