diff options
| author | Cédric Bonhomme <cedric@cedricbonhomme.org> | 2017-05-23 21:24:04 +0200 |
|---|---|---|
| committer | Cédric Bonhomme <cedric@cedricbonhomme.org> | 2017-05-23 21:24:04 +0200 |
| commit | ec30925914fba06ba73a748d745c1a7356f2e53d (patch) | |
| tree | 31063d7fff39852b16dc70d529eddb8c0dd737e4 /src/web/views | |
| parent | Fixed conflicts. (diff) | |
| download | newspipe-ec30925914fba06ba73a748d745c1a7356f2e53d.tar.gz newspipe-ec30925914fba06ba73a748d745c1a7356f2e53d.tar.bz2 newspipe-ec30925914fba06ba73a748d745c1a7356f2e53d.zip | |
Improved display of bookmark's tags. And fixed some remainings merge related bugs.
Diffstat (limited to 'src/web/views')
| -rw-r--r-- | src/web/views/__init__.py | 3 | ||||
| -rw-r--r-- | src/web/views/bookmark.py | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/src/web/views/__init__.py b/src/web/views/__init__.py index e0e49927..41bb52f3 100644 --- a/src/web/views/__init__.py +++ b/src/web/views/__init__.py @@ -6,11 +6,12 @@ from web.views.category import category_bp, categories_bp from web.views.icon import icon_bp from web.views.admin import admin_bp from web.views.user import user_bp, users_bp +from web.views.bookmark import bookmark_bp, bookmarks_bp __all__ = ['views', 'home', 'session_mgmt', 'v2', 'v3', 'article_bp', 'articles_bp', 'feed_bp', 'feeds_bp', 'category_bp', 'categories_bp', 'icon_bp', - 'admin_bp', 'user_bp', 'users_bp'] + 'admin_bp', 'user_bp', 'users_bp', 'bookmark_bp', 'bookmarks_bp'] import conf from flask import request diff --git a/src/web/views/bookmark.py b/src/web/views/bookmark.py index 64acded4..c3a6e7bd 100644 --- a/src/web/views/bookmark.py +++ b/src/web/views/bookmark.py @@ -38,7 +38,7 @@ def form(bookmark_id=None): action = gettext('Edit bookmark') head_titles = [action] form = BookmarkForm(obj=bookmark) - form.tags.data = bookmark.tags_proxy + form.tags.data = ", ".join(bookmark.tags_proxy) return render_template('edit_bookmark.html', action=action, head_titles=head_titles, bookmark=bookmark, form=form) |