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

Remove condition of being logged in to view blog dashboard.

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

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

@ -55,6 +55,7 @@ def blog_edit(request):
url_user = request.matchdict.get('user', None) url_user = request.matchdict.get('user', None)
blog_slug = request.matchdict.get('blog_slug', None) blog_slug = request.matchdict.get('blog_slug', None)
max_blog_count = 4 max_blog_count = 4
form = blog_forms.BlogEditForm(request.form) form = blog_forms.BlogEditForm(request.form)
# the blog doesn't exists yet # the blog doesn't exists yet
@ -203,25 +204,34 @@ def blogpost_edit(request):
'blog_post_slug': blog_post_slug 'blog_post_slug': blog_post_slug
}) })
@require_active_login
@uses_pagination @uses_pagination
def blog_dashboard(request, page): def blog_dashboard(request, page):
url_user = request.matchdict.get('user') url_user = request.matchdict.get('user')
user = request.db.User.query.filter_by(username=url_user).one() user = request.db.User.query.filter_by(username=url_user).one()
blog_slug = request.matchdict.get('blog_slug', None) blog_slug = request.matchdict.get('blog_slug', None)
max_blog_count = 4
blogs = request.db.Blog.query.filter_by(author=request.user.id) #_log.info(dir(mg_globals.app_config['max_blog_count']))
if blog_slug and user.id == request.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:
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:
blog = blogs.filter(Blog.slug==blog_slug).first() blog = blogs.filter(Blog.slug==blog_slug).first()
if not blog: if not blog:
return render_404(request) return render_404(request)
else:
blog_posts_list = blog.get_all_blog_posts().order_by(MediaEntry.created.desc()) blog_posts_list = blog.get_all_blog_posts().order_by(MediaEntry.created.desc())
_log.info(type(blog_posts_list))
pagination = Pagination(page, blog_posts_list) pagination = Pagination(page, blog_posts_list)
pagination.per_page = 15 pagination.per_page = 15
blog_posts_on_a_page = pagination() blog_posts_on_a_page = pagination()
if may_edit_blogpost(request, blog): if may_edit_blogpost(request, blog):
return render_to_response( return render_to_response(
request, request,
@ -231,18 +241,6 @@ def blog_dashboard(request, page):
'blog':blog, 'blog':blog,
'pagination':pagination 'pagination':pagination
}) })
else:
return render_403(request)
else:
blogs = request.db.Blog.query.filter_by(author=user.id)
_log.info(blogs.count())
return render_to_response(
request,
'mediagoblin/blog/list_of_blogs.html',
{
'blogs':blogs,
'url_user':url_user
})