diff --git a/README.md b/README.md index 7ef1fad..0551757 100644 --- a/README.md +++ b/README.md @@ -6,9 +6,7 @@ logged in users are presumed to all be admins with distinction only between bein # assorted todo -- ==privacy settings in database to keep selected members private to logged-in users == -- ==privacy settings for groups? == -- ==privacy settings for blog posts== +- privacy settings for blog posts - add delete button to blog posts on main feed - show blog posts in edit member section with a delete button - page theme edit inside the user (below user theme?) diff --git a/myriad/blog.py b/myriad/blog.py index acfb25c..1fd73ad 100644 --- a/myriad/blog.py +++ b/myriad/blog.py @@ -35,8 +35,9 @@ def new(): title = request.form['title'] content = request.form['content'] mid = request.form["mid"] + privacy = request.form["privacy"] - db.execute("INSERT INTO blog (member_id, title, content) VALUES (?, ?, ?)",(mid, title, content)) + db.execute("INSERT INTO blog (member_id, title, content, public) VALUES (?, ?, ?, ?)",(mid, title, content, privacy)) db.commit() return redirect(url_for('blog.blog')) @@ -44,3 +45,15 @@ def new(): return render_template('blog/new.html', members=members) +@bp.route("/delete//") +@login_required +def delete(pid, location): + db = get_db() + db.execute("DELETE FROM blog WHERE id=(?)",(pid,)) + db.commit() + + if location == "blog": + return redirect(url_for("blog.blog")) + else: + return redirect(url_for("home.page", mid=location)) + diff --git a/myriad/templates/blog/blog.html b/myriad/templates/blog/blog.html index ec1d5ad..a0083e9 100644 --- a/myriad/templates/blog/blog.html +++ b/myriad/templates/blog/blog.html @@ -8,6 +8,9 @@ {% for post in blog %} {% set op = member_ids[post[1]] %} + {% if not g.user and op[23]==0 %} + {% elif not g.user and post[5]==0 %} + {% else %}
{% if member_icons[op[0]][0] %} @@ -15,12 +18,16 @@ {% endif %}
{{post[3]|safe}}
-
{{post[2]}} - {{op[3]}}
+
{{post[2]}} - {{op[3]}} {% if g.user %}{% if op[23]==0 %}(Private){% else %}(Public){% endif %}{% endif %}
{{post[4]|safe}}

+ {% if g.user %} + {% if post[5]==0 %}Private{% else %}Public{% endif %} | Delete post + {% endif %}
+ {% endif %} {% endfor %} {% endblock %} \ No newline at end of file diff --git a/myriad/templates/blog/new.html b/myriad/templates/blog/new.html index 1e06a32..60f11a6 100644 --- a/myriad/templates/blog/new.html +++ b/myriad/templates/blog/new.html @@ -15,7 +15,12 @@ {% for member in members %} {% endfor %} - + +
+ +
+ +
diff --git a/myriad/templates/page.html b/myriad/templates/page.html index d061b07..3f240ab 100644 --- a/myriad/templates/page.html +++ b/myriad/templates/page.html @@ -3,6 +3,10 @@ {% block content %} + {% if not g.user and member[23]==0 %} + permission denied + {% else %} + {% if icon %} {% else %} @@ -18,13 +22,17 @@
{{member[3]}}'s blog
{% for post in blog %} + {% if not g.user and post[5]==0 %} + {% else %}
{{post[3]|safe}}
-
{{post[2]}}
+
{{post[2]}} {% if g.user %}{% if post[5]==0 %}(Private){% else %}(Public){% endif %}{% endif %}
{{post[4]|safe}}
+ {% if g.user %}Delete post{% endif %}
+ {% endif %} {% endfor %}
{% endif %} @@ -37,4 +45,6 @@ {% endif %} + {% endif %} + {% endblock %} \ No newline at end of file