diff --git a/myriad/blog.py b/myriad/blog.py index 0a2a5ec..acfb25c 100644 --- a/myriad/blog.py +++ b/myriad/blog.py @@ -13,12 +13,17 @@ bp = Blueprint('blog', __name__, url_prefix='/blog') def blog(): db = get_db() posts = db.execute("SELECT * FROM blog ORDER BY created DESC").fetchall() - members = db.execute("SELECT id,member_name FROM member").fetchall() + members = db.execute("SELECT * FROM member").fetchall() member_ids={} + member_icons={} for member in members: - member_ids[member[0]] = member[1] + mid = member[0] + iconid = member[6] + member_ids[mid] = member + icon = db.execute("SELECT icon_location FROM icons WHERE id=(?)",(iconid,)).fetchone() + member_icons[mid] = icon - return render_template('blog/blog.html', blog=posts, member_ids=member_ids) + return render_template('blog/blog.html', blog=posts, member_ids=member_ids, member_icons=member_icons) @bp.route('/new', methods=('GET', 'POST')) @login_required diff --git a/myriad/templates/blog/blog.html b/myriad/templates/blog/blog.html index 6f8a2c3..784d758 100644 --- a/myriad/templates/blog/blog.html +++ b/myriad/templates/blog/blog.html @@ -7,12 +7,19 @@ {% block content %} {% for post in blog %} + {% set op = member_ids[post[1]] %}
+ {% if member_icons[op[0]][0] %} + + {% else %} + + {% endif %}
{{post[3]}}
-
{{post[2]}} - {{member_ids[post[1]]}}
+
{{post[2]}} - {{op[3]}}
{{post[4]}}
+
{% endfor %}