heckyel/mediagoblin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Refactor views using functions in lib file.

Browse Source
This commit is contained in:
Aditi 2013-08-28 23:42:35 +05:30
parent 3a971ef736
commit 0b2ea4bb4f
1 changed files with 19 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -15,7 +15,6 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>. # along with this program. If not, see <http://www.gnu.org/licenses/>.
import logging import logging
_log = logging.getLogger(__name__) _log = logging.getLogger(__name__)
from datetime import datetime from datetime import datetime
@ -26,20 +25,20 @@ from mediagoblin import mg_globals
from mediagoblin.media_types.blog import forms as blog_forms from mediagoblin.media_types.blog import forms as blog_forms
from mediagoblin.media_types.blog.models import Blog, BlogPostData from mediagoblin.media_types.blog.models import Blog, BlogPostData
from mediagoblin.media_types.blog.lib import may_edit_blogpost, set_blogpost_state from mediagoblin.media_types.blog.lib import may_edit_blogpost, set_blogpost_state, get_all_blogposts_of_blog
from mediagoblin.messages import add_message, SUCCESS, ERROR from mediagoblin.messages import add_message, SUCCESS, ERROR
from mediagoblin.decorators import (require_active_login, active_user_from_url, from mediagoblin.decorators import (require_active_login, active_user_from_url,
get_media_entry_by_id, user_may_alter_collection, get_media_entry_by_id, user_may_alter_collection,
get_user_collection) get_user_collection, uses_pagination)
from mediagoblin.tools.pagination import Pagination
from mediagoblin.tools.response import (render_to_response, from mediagoblin.tools.response import (render_to_response,
redirect, redirect_obj, render_404) redirect, render_404)
from mediagoblin.tools.translate import pass_to_ugettext as _ from mediagoblin.tools.translate import pass_to_ugettext as _
from mediagoblin.tools.template import render_template from mediagoblin.tools.template import render_template
from mediagoblin.tools.text import ( from mediagoblin.tools.text import (
convert_to_tag_list_of_dicts, media_tags_as_string, clean_html, convert_to_tag_list_of_dicts, media_tags_as_string, clean_html,
cleaned_markdown_conversion) cleaned_markdown_conversion)
from mediagoblin.tools.url import slugify
from mediagoblin.db.util import check_media_slug_used, check_collection_slug_used 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
@ -71,9 +70,9 @@ def blog_edit(request):
if request.method=='POST' and form.validate(): if request.method=='POST' and form.validate():
_log.info("Here") _log.info("Here")
blog = Blog() blog = request.db.Blog()
blog.title = unicode(form.title.data) blog.title = unicode(form.title.data)
blog.description = unicode(cleaned_markdown_conversion((form.description.data))) #remember clean html data. blog.description = unicode(cleaned_markdown_conversion((form.description.data)))
blog.author = request.user.id blog.author = request.user.id
blog.generate_slug() blog.generate_slug()
@ -92,7 +91,7 @@ def blog_edit(request):
#Blog already exists. #Blog already exists.
else: else:
blog = Blog.query.filter_by(slug=blog_slug).first() blog = request.db.Blog.query.filter_by(slug=blog_slug).first()
if request.method == 'GET': if request.method == 'GET':
defaults = dict( defaults = dict(
title = blog.title, title = blog.title,
@ -120,6 +119,7 @@ def blog_edit(request):
user=request.user.username, user=request.user.username,
blog_slug=blog.slug) blog_slug=blog.slug)
@require_active_login @require_active_login
def blogpost_create(request): def blogpost_create(request):
@ -210,7 +210,7 @@ def blog_dashboard(request):
url_user = request.matchdict.get('user') url_user = request.matchdict.get('user')
blog_posts_list = [] blog_posts_list = []
blog_slug = request.matchdict.get('blog_slug') blog_slug = request.matchdict.get('blog_slug', None)
_log.info(blog_slug) _log.info(blog_slug)
blog = request.db.Blog.query.filter_by(slug=blog_slug).first() blog = request.db.Blog.query.filter_by(slug=blog_slug).first()
@ -218,13 +218,7 @@ def blog_dashboard(request):
if not blog: if not blog:
return render_404(request) return render_404(request)
blog_post_data = request.db.BlogPostData.query.filter_by(blog=blog.id).all() blog_posts_list = get_all_blogposts_of_blog(request, blog)
for each_blog_post_data in blog_post_data:
blog_post = each_blog_post_data.get_media_entry
if blog_post:
blog_posts_list.append(blog_post)
blog_posts_list.reverse()
blog_post_count = len(blog_posts_list) blog_post_count = len(blog_posts_list)
if may_edit_blogpost(request, blog): if may_edit_blogpost(request, blog):
@ -237,20 +231,19 @@ def blog_dashboard(request):
'blog_post_count':blog_post_count 'blog_post_count':blog_post_count
}) })
#supposed to list all the blog posts not just belonging to a particular post.
#supposed to list all the blog posts belonging to a particular blog of particular user.
def blog_post_listing(request): def blog_post_listing(request):
blog_owner = request.matchdict.get('user') blog_owner = request.matchdict.get('user')
blog_slug = request.matchdict.get('blog_slug', None)
owner_user = User.query.filter_by(username=blog_owner).one() owner_user = User.query.filter_by(username=blog_owner).one()
blog = request.db.Blog.query.filter_by(author=request.user.id, slug=blog_slug).first()
if not owner_user: if not owner_user or not blog:
return render_404(request) return render_404(request)
all_blog_posts = MediaEntry.query.filter_by( all_blog_posts = get_all_blogposts_of_blog(request, blog, u'processed')
uploader=owner_user.id, media_type='mediagoblin.media_types.blogpost',
state=u'processed').all()
all_blog_posts.reverse()
_log.info(len(all_blog_posts))
return render_to_response( return render_to_response(
request, request,
@ -261,8 +254,8 @@ def blog_post_listing(request):
def draft_view(request): def draft_view(request):
blog_slug = request.matchdict.get('blog_slug') blog_slug = request.matchdict.get('blog_slug', None)
blog_post_slug = request.matchdict.get('blog_post_slug') blog_post_slug = request.matchdict.get('blog_post_slug', None)
user = request.matchdict.get('user') user = request.matchdict.get('user')
blog = request.db.Blog.query.filter_by(author=request.user.id, slug=blog_slug).first() blog = request.db.Blog.query.filter_by(author=request.user.id, slug=blog_slug).first()