X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=mediagoblin%2Fmedia_types%2Fblog%2Fviews.py;h=288a47ae08451239447a76e7c20dcda0f066b6d2;hb=e08de70757b6f973bc2955f1b3292d383a19b21d;hp=3a4dfe6a364e0821cebd3f6e10504f2c4f387402;hpb=e49b7e02b2150413d2e78db709277fae0887be46;p=mediagoblin.git diff --git a/mediagoblin/media_types/blog/views.py b/mediagoblin/media_types/blog/views.py index 3a4dfe6a..288a47ae 100644 --- a/mediagoblin/media_types/blog/views.py +++ b/mediagoblin/media_types/blog/views.py @@ -32,7 +32,6 @@ from mediagoblin.media_types.blog.lib import ( may_edit_blogpost, set_blogpost_state, get_all_blogposts_of_blog, get_blog_by_slug) -from mediagoblin.messages import add_message, SUCCESS, ERROR from mediagoblin.decorators import (require_active_login, active_user_from_url, get_media_entry_by_id, user_may_alter_collection, get_user_collection, uses_pagination) @@ -46,7 +45,7 @@ from mediagoblin.tools.text import ( cleaned_markdown_conversion) from mediagoblin.db.util import check_media_slug_used, check_collection_slug_used -from mediagoblin.db.models import User, Collection, MediaEntry +from mediagoblin.db.models import User, Collection, MediaEntry, LocalUser from mediagoblin.notifications import add_comment_subscription @@ -54,7 +53,7 @@ from mediagoblin.notifications import add_comment_subscription @require_active_login def blog_edit(request): """ - View for editing an existing blog or creating a new blog + View for editing an existing blog or creating a new blog if user have not exceeded maximum allowed acount of blogs. """ url_user = request.matchdict.get('user', None) @@ -87,8 +86,10 @@ def blog_edit(request): user=request.user.username ) else: - add_message(request, ERROR, "Welcome! You already have created \ - maximum number of blogs.") + messages.add_message( + request, + messages.ERROR, + "Welcome! You already have created maximum number of blogs.") return redirect(request, "mediagoblin.media_types.blog.blog_admin_dashboard", user=request.user.username) @@ -120,7 +121,10 @@ def blog_edit(request): blog.generate_slug() blog.save() - add_message(request, SUCCESS, "Your blog is updated.") + messages.add_message( + request, + messages.SUCCESS, + "Your blog is updated.") return redirect(request, "mediagoblin.media_types.blog.blog-dashboard", user=request.user.username, blog_slug=blog.slug) @@ -143,7 +147,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) @@ -155,7 +159,10 @@ def blogpost_create(request): blog_post_data.media_entry = blogpost.id blog_post_data.save() - add_message(request, SUCCESS, _('Woohoo! Submitted!')) + messages.add_message( + request, + messages.SUCCESS, + _('Woohoo! Submitted!')) add_comment_subscription(request.user, blogpost) return redirect(request, "mediagoblin.media_types.blog.blog-dashboard", user=request.user.username, @@ -171,11 +178,11 @@ def blogpost_create(request): @require_active_login 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: @@ -197,7 +204,10 @@ def blogpost_edit(request): blogpost.generate_slug() blogpost.save() - add_message(request, SUCCESS, _('Woohoo! edited blogpost is submitted')) + messages.add_message( + request, + messages.SUCCESS, + _('Woohoo! edited blogpost is submitted')) return redirect(request, "mediagoblin.media_types.blog.blog-dashboard", user=request.user.username, blog_slug=blog.slug) @@ -261,8 +271,8 @@ def blog_post_listing(request, page, url_user=None): """ Page, listing all the blog posts of a particular blog. """ - blog_slug = request.matchdict.get('blog_slug', None) - blog = get_blog_by_slug(request, blog_slug, author=request.user.id) + blog_slug = request.matchdict['blog_slug'] + blog = get_blog_by_slug(request, blog_slug, author=url_user.id) if not blog: return render_404(request) @@ -279,7 +289,7 @@ def blog_post_listing(request, page, url_user=None): 'blog_owner': url_user, 'blog':blog }) - + @require_active_login def draft_view(request): @@ -287,7 +297,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) @@ -298,40 +308,47 @@ def draft_view(request): {'blogpost':blogpost, 'blog': blog }) - - + + @require_active_login def blog_delete(request, **kwargs): """ - Deletes a blog and media entries, tags associated with it. + Deletes a blog and media entries, tags associated with it. """ url_user = request.matchdict.get('user') - owner_user = request.db.User.query.filter_by(username=url_user).first() + owner_user = request.db.LocalUser.query.filter( + LocalUser.username==url_user + ).first() blog_slug = request.matchdict.get('blog_slug', None) blog = get_blog_by_slug(request, blog_slug, author=owner_user.id) if not blog: - return render_404(reequest) + return render_404(request) form = blog_forms.ConfirmDeleteForm(request.form) if request.user.id == blog.author or request.user.has_privilege(u'admin'): if request.method == 'POST' and form.validate(): if form.confirm.data is True: blog.delete() - add_message( - request, SUCCESS, _('You deleted the Blog.')) + messages.add_message( + request, + messages.SUCCESS, + _('You deleted the Blog.')) return redirect(request, "mediagoblin.media_types.blog.blog_admin_dashboard", user=request.user.username) else: - add_message( - request, ERROR, - _("The media was not deleted because you didn't check that you were sure.")) + messages.add_message( + request, + messages.ERROR, + _("The media was not deleted because you didn't check " + "that you were sure.")) return redirect(request, "mediagoblin.media_types.blog.blog_admin_dashboard", user=request.user.username) else: if request.user.has_privilege(u'admin'): - add_message( - request, WARNING, + messages.add_message( + request, + messages.WARNING, _("You are about to delete another user's Blog. " "Proceed with caution.")) return render_to_response( @@ -341,26 +358,31 @@ def blog_delete(request, **kwargs): 'form':form }) else: - add_message( - request, ERROR, - _("The blog was not deleted because you have no rights.")) + messages.add_message( + request, + messages.ERROR, + _("The blog was not deleted because you have no rights.")) return redirect(request, "mediagoblin.media_types.blog.blog_admin_dashboard", user=request.user.username) - - + + def blog_about_view(request): """ Page containing blog description and statistics """ blog_slug = request.matchdict.get('blog_slug', None) url_user = request.matchdict.get('user', None) - - user = request.db.User.query.filter_by(username=url_user).first() - blog = get_blog_by_slug(request, blog_slug, author=user.id) - + + user = request.db.LocalUser.query.filter( + LocalUser.username==url_user + ).first() + + if user: + blog = get_blog_by_slug(request, blog_slug, author=user.id) + if not user or not blog: return render_404(request) - + else: blog_posts_processed = blog.get_all_blog_posts(u'processed').count() return render_to_response( @@ -370,11 +392,3 @@ def blog_about_view(request): 'blog': blog, 'blogpost_count': blog_posts_processed }) - - - - - - - -