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

Amend blog_dashboard view for accomodating all conditions.

Browse Source
This commit is contained in:
Aditi Mittal 2013-09-07 12:01:27 +05:30
parent 5961431097
commit cc37c8f8f9
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -214,15 +214,7 @@ def blog_dashboard(request, page):
max_blog_count = 4 max_blog_count = 4
#_log.info(dir(mg_globals.app_config['max_blog_count'])) #_log.info(dir(mg_globals.app_config['max_blog_count']))
blogs = request.db.Blog.query.filter_by(author=user.id) blogs = request.db.Blog.query.filter_by(author=user.id)
if not request.user or request.user.id != user.id or not request.user.is_admin or not blog_slug: if (request.user and request.user.id == user.id) or (request.user and request.user.is_admin):
return render_to_response(
request,
'mediagoblin/blog/list_of_blogs.html',
{
'blogs':blogs,
'user':user
})
elif (request.user and request.user.id == user.id) or request.user.is_admin:
if blog_slug: if blog_slug:
blog = blogs.filter(Blog.slug==blog_slug).first() blog = blogs.filter(Blog.slug==blog_slug).first()
if not blog: if not blog:
@ -241,6 +233,14 @@ def blog_dashboard(request, page):
'blog':blog, 'blog':blog,
'pagination':pagination 'pagination':pagination
}) })
if not request.user or request.user.id != user.id or not blog_slug:
return render_to_response(
request,
'mediagoblin/blog/list_of_blogs.html',
{
'blogs':blogs,
'user':user
})