aboutsummaryrefslogtreecommitdiffstats
path: root/mediagoblin/templates
diff options
context:
space:
mode:
authorayleph <ayleph@thisshitistemp.com>2015-12-06 14:48:45 -0500
committerJessica Tallon <tsyesika@tsyesika.se>2016-01-15 10:15:41 +0000
commitbeb5a4a150baba1f7219749ee47f96b01f3fdb0f (patch)
tree3c5a044d548f687db243fb94faaa0f2f7e481168 /mediagoblin/templates
parenteebd0063feb19ea696f632dbb60588f0591c037b (diff)
downloadmediagoblin-beb5a4a150baba1f7219749ee47f96b01f3fdb0f.tar.lz
mediagoblin-beb5a4a150baba1f7219749ee47f96b01f3fdb0f.tar.xz
mediagoblin-beb5a4a150baba1f7219749ee47f96b01f3fdb0f.zip
Fix issue 5366 Update blog views
This commit updates blog views to be compatible with recent database migrations. Signed-off-by: Jessica Tallon <tsyesika@tsyesika.se>
Diffstat (limited to 'mediagoblin/templates')
-rw-r--r--mediagoblin/templates/mediagoblin/user_pages/blog_media.html12
1 files changed, 6 insertions, 6 deletions
diff --git a/mediagoblin/templates/mediagoblin/user_pages/blog_media.html b/mediagoblin/templates/mediagoblin/user_pages/blog_media.html
index ece47fe1..ec63e699 100644
--- a/mediagoblin/templates/mediagoblin/user_pages/blog_media.html
+++ b/mediagoblin/templates/mediagoblin/user_pages/blog_media.html
@@ -37,8 +37,8 @@
<p class="context">
{%- trans user_url=request.urlgen(
'mediagoblin.user_pages.user_home',
- user=media.get_uploader.username),
- username=media.get_uploader.username -%}
+ user=media.get_actor.username),
+ username=media.get_actor.username -%}
❖ Blog post by <a href="{{user_url}}">{{username}}</a>
{%- endtrans -%}
</p>
@@ -68,14 +68,14 @@
{% endblock %}
</div>
{% if request.user and
- (media.uploader == request.user.id or
+ (media.actor == request.user.id or
request.user.has_privilege('admin')) %}
{% set edit_url = request.urlgen('mediagoblin.media_types.blog.blogpost.edit',
blog_slug=media.media_manager.get_blog_by_blogpost().slug,
user=request.user.username, blog_post_slug=media.slug) %}
<a class="button_action" href="{{ edit_url }}">{% trans %}Edit{% endtrans %}</a>
{% set delete_url = request.urlgen('mediagoblin.user_pages.media_confirm_delete',
- user= media.get_uploader.username,
+ user= media.get_actor.username,
media_id=media.id) %}
<a class="button_action" href="{{ delete_url }}">{% trans %}Delete{% endtrans %}</a>
@@ -96,7 +96,7 @@
{% endif %}
{% if request.user %}
<form action="{{ request.urlgen('mediagoblin.user_pages.media_post_comment',
- user= media.get_uploader.username,
+ user= media.get_actor.username,
media_id=media.id) }}" method="POST" id="form_comment">
{{ wtforms_util.render_divs(comment_form) }}
<div class="form_submit_buttons">
@@ -124,7 +124,7 @@
</a>
<a href="{{ request.urlgen('mediagoblin.user_pages.media_home.view_comment',
comment=comment.id,
- user=media.get_uploader.username,
+ user=media.get_actor.username,
media=media.slug_or_id) }}#comment"
class="comment_whenlink">
<span title='{{- comment.created.strftime("%I:%M%p %Y-%m-%d") -}}'>