~cedric/newspipe

ec30925914fba06ba73a748d745c1a7356f2e53d — Cédric Bonhomme 3 years ago a756a3e
Improved display of bookmark's tags. And fixed some remainings merge related bugs.
M src/runserver.py => src/runserver.py +2 -0
@@ 56,6 56,8 @@ with application.app_context():
    application.register_blueprint(views.admin_bp)
    application.register_blueprint(views.users_bp)
    application.register_blueprint(views.user_bp)
    application.register_blueprint(views.bookmarks_bp)
    application.register_blueprint(views.bookmark_bp)


if __name__ == '__main__':

M src/web/models/__init__.py => src/web/models/__init__.py +5 -2
@@ 32,9 32,12 @@ from .user import User
from .article import Article
from .icon import Icon
from .category import Category
from .tag import Tag
from .tag import BookmarkTag
from .tag import ArticleTag
from .bookmark import Bookmark

__all__ = ['Feed', 'Role', 'User', 'Article', 'Icon', 'Category', 'Tag']
__all__ = ['Feed', 'Role', 'User', 'Article', 'Icon', 'Category',
            'Bookmark', 'ArticleTag', 'BookmarkTag']

import os


M src/web/models/article.py => src/web/models/article.py +4 -4
@@ 52,10 52,10 @@ class Article(db.Model, RightMixin):
    category_id = db.Column(db.Integer(), db.ForeignKey('category.id'))

    # relationships
    tag_objs = db.relationship('Tag', back_populates='article',
                            cascade='all,delete-orphan',
                            lazy=False,
                            foreign_keys='[Tag.article_id]')
    tag_objs = db.relationship('ArticleTag', back_populates='article',
                                 cascade='all,delete-orphan',
                                 lazy=False,
                                 foreign_keys='[ArticleTag.article_id]')
    tags = association_proxy('tag_objs', 'text')

    # index

M src/web/templates/bookmarks.html => src/web/templates/bookmarks.html +10 -3
@@ 5,9 5,16 @@
    <ul class="list-group">
    {% for bookmark in bookmarks %}
        <li class="list-group-item">
            <a href="{{ bookmark.href }}">{{ bookmark.href }}</a>&nbsp;
            <a href="{{ bookmark.href }}">{{ bookmark.tags_proxy }}</a>&nbsp;
            <a href="{{ url_for('bookmark.form', bookmark_id=bookmark.id) }}">edit</a>
            <a href="#">
                <h4 class="list-group-item-heading">
                    <a href="{{ bookmark.href }}">{{ bookmark.title }}</a>
                </h4>
                <p class="list-group-item-text">
                    {{ bookmark.description }}<br />
                    {{ ", ".join(bookmark.tags_proxy) }}
                    <a href="{{ url_for('bookmark.form', bookmark_id=bookmark.id) }}">edit</a>
                </p>
            </a>
        </li>
    {% endfor %}
    </ul>

M src/web/views/__init__.py => src/web/views/__init__.py +2 -1
@@ 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

M src/web/views/bookmark.py => src/web/views/bookmark.py +1 -1
@@ 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)