heckyel/mediagoblin
0
0
Fork 0
Code Issues Pull Requests Releases Activity

Fix issue 5366 Update blog views

Browse Source 
This commit updates blog views to be compatible with recent database
migrations.

Signed-off-by: Jessica Tallon <tsyesika@tsyesika.se>
This commit is contained in:
ayleph
2015-12-06 14:48:45 -05:00
committed by Jessica Tallon
parent eebd0063fe
commit beb5a4a150
5 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mediagoblin/media_types/blog/templates/mediagoblin/blog/blog_admin_dashboard.html
View File

@@ -86,7 +86,7 @@
blog_slug=blog.slug, user=request.user.username,
blog_post_slug=blog_post.slug) %}
{% set blogpost_delete_url = request.urlgen('mediagoblin.user_pages.media_confirm_delete',
user= blog_post.get_uploader.username,
user= blog_post.get_actor.username,
media_id=blog_post.id) %}
<td>
<a class="button_action" href="{{ blogpost_edit_url }}">{% trans %}Edit{% endtrans %}</a>

2
mediagoblin/media_types/blog/templates/mediagoblin/blog/blog_post_listing.html
View File

@@ -48,7 +48,7 @@
<a href="{{ request.urlgen(
'mediagoblin.user_pages.user_tag_gallery',
tag=tag['slug'],
user=post.get_uploader.username) }}">{{ tag['name'] }} |</a>
user=post.get_actor.username) }}">{{ tag['name'] }} |</a>
{% endfor %}
{% endif %}
<div class="b_list_des"> <p>{{ post.description|safe }} </p></div>

2
mediagoblin/media_types/blog/templates/mediagoblin/blog/blogpost_draft_view.html
View File

@@ -30,7 +30,7 @@
blog_slug=blog.slug, user=request.user.username,
blog_post_slug=blogpost.slug) %}
{% set blogpost_delete_url = request.urlgen('mediagoblin.user_pages.media_confirm_delete',
user= blogpost.get_uploader.username,
user= blogpost.get_actor.username,
media_id=blogpost.id) %}
<a class="button_action" href="{{ blogpost_edit_url }}">{% trans %}Edit{% endtrans %}</a>
<a class="button_action" href="{{ blogpost_delete_url }}">{% trans %}Delete{% endtrans %}</a>

10
mediagoblin/media_types/blog/views.py
View File

@@ -143,7 +143,7 @@ def blogpost_create(request):
blogpost.description = six.text_type(cleaned_markdown_conversion((form.description.data)))
blogpost.tags = convert_to_tag_list_of_dicts(form.tags.data)
blogpost.license = six.text_type(form.license.data) or None
blogpost.uploader = request.user.id
blogpost.actor = request.user.id
blogpost.generate_slug()
set_blogpost_state(request, blogpost)
@@ -175,7 +175,7 @@ def blogpost_edit(request):
blog_slug = request.matchdict.get('blog_slug', None)
blog_post_slug = request.matchdict.get('blog_post_slug', None)
blogpost = request.db.MediaEntry.query.filter_by(slug=blog_post_slug, uploader=request.user.id).first()
blogpost = request.db.MediaEntry.query.filter_by(slug=blog_post_slug, actor=request.user.id).first()
blog = get_blog_by_slug(request, blog_slug, author=request.user.id)
if not blogpost or not blog:
@@ -287,7 +287,7 @@ def draft_view(request):
blog_post_slug = request.matchdict.get('blog_post_slug', None)
user = request.matchdict.get('user')
blog = get_blog_by_slug(request, blog_slug, author=request.user.id)
blogpost = request.db.MediaEntry.query.filter_by(state = u'failed', uploader=request.user.id, slug=blog_post_slug).first()
blogpost = request.db.MediaEntry.query.filter_by(state = u'failed', actor=request.user.id, slug=blog_post_slug).first()
if not blog or not blogpost:
return render_404(request)
@@ -357,8 +357,8 @@ def blog_about_view(request):
blog_slug = request.matchdict.get('blog_slug', None)
url_user = request.matchdict.get('user', None)
user = request.db.User.query.filter(
LocalUser.username=url_user
user = request.db.LocalUser.query.filter(
LocalUser.username==url_user
).first()
blog = get_blog_by_slug(request, blog_slug, author=user.id)