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

Convert blog plugin to use new privileges system

Browse Source 
there is no user.is_admin anymore. Adapt to use the new privileges
system.
This commit is contained in:
Sebastian Spaeth 2013-12-12 17:13:48 +01:00
parent 14103077e9
commit 39fbb83490
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mediagoblin/media_types/blog/lib.py
View File

@ -24,7 +24,7 @@ def check_blog_slug_used(author_id, slug, ignore_b_id=None):
return does_exist return does_exist
def may_edit_blogpost(request, blog): def may_edit_blogpost(request, blog):
if request.user.is_admin or request.user.id == blog.author: if request.user.has_privilege(u'admin') or request.user.id == blog.author:
return True return True
return False return False

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

@ -221,7 +221,7 @@ def blog_dashboard(request, page):
blogs = request.db.Blog.query.filter_by(author=user.id) blogs = request.db.Blog.query.filter_by(author=user.id)
config = pluginapi.get_config('mediagoblin.media_types.blog') config = pluginapi.get_config('mediagoblin.media_types.blog')
max_blog_count = config['max_blog_count'] max_blog_count = config['max_blog_count']
if (request.user and request.user.id == user.id) or (request.user and request.user.is_admin): if request.user and (request.user.id == user.id or request.user.has_privilege(u'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:
@ -316,7 +316,7 @@ def blog_delete(request, **kwargs):
return render_404(reequest) return render_404(reequest)
form = blog_forms.ConfirmDeleteForm(request.form) form = blog_forms.ConfirmDeleteForm(request.form)
if request.user.id == blog.author or request.user.is_admin: if request.user.id == blog.author or request.user.has_privilege(u'admin'):
if request.method == 'POST' and form.validate(): if request.method == 'POST' and form.validate():
if form.confirm.data is True: if form.confirm.data is True:
blog.delete() blog.delete()
@ -331,7 +331,7 @@ def blog_delete(request, **kwargs):
return redirect(request, "mediagoblin.media_types.blog.blog_admin_dashboard", return redirect(request, "mediagoblin.media_types.blog.blog_admin_dashboard",
user=request.user.username) user=request.user.username)
else: else:
if request.user.is_admin: if request.user.has_privilege(u'admin'):
add_message( add_message(
request, WARNING, request, WARNING,
_("You are about to delete another user's Blog. " _("You are about to delete another user's Blog. "

2
mediagoblin/templates/mediagoblin/user_pages/blog_media.html
View File

@ -69,7 +69,7 @@
</div> </div>
{% if request.user and {% if request.user and
(media.uploader == request.user.id or (media.uploader == request.user.id or
request.user.is_admin) %} request.user.has_privilege('admin')) %}
{% set edit_url = request.urlgen('mediagoblin.media_types.blog.blogpost.edit', {% set edit_url = request.urlgen('mediagoblin.media_types.blog.blogpost.edit',
blog_slug=media.media_manager.get_blog_by_blogpost().slug, blog_slug=media.media_manager.get_blog_by_blogpost().slug,
user=request.user.username, blog_post_slug=media.slug) %} user=request.user.username, blog_post_slug=media.slug) %}

2
mediagoblin/user_pages/views.py
View File

@ -305,7 +305,7 @@ def media_confirm_delete(request):
return render_404(request) return render_404(request)
uploader_id = media.uploader uploader_id = media.uploader
if not (request.user.is_admin or if not (request.user.has_privilege(u'admin') or
request.user.id == uploader_id): request.user.id == uploader_id):
raise Forbidden() raise Forbidden()