aboutsummaryrefslogtreecommitdiffstats
path: root/mediagoblin/media_types
diff options
context:
space:
mode:
authorSebastian Spaeth <Sebastian@SSpaeth.de>2013-12-12 17:13:48 +0100
committerSebastian Spaeth <Sebastian@SSpaeth.de>2013-12-12 17:13:48 +0100
commit39fbb83490ccb30858d62f35f6a1f4c1813b23d2 (patch)
treee85ace2d51a7d6d6178d556176161b8a2df7ccf1 /mediagoblin/media_types
parent14103077e911277f3af6509d1ef7d0ccc8ac146a (diff)
downloadmediagoblin-39fbb83490ccb30858d62f35f6a1f4c1813b23d2.tar.lz
mediagoblin-39fbb83490ccb30858d62f35f6a1f4c1813b23d2.tar.xz
mediagoblin-39fbb83490ccb30858d62f35f6a1f4c1813b23d2.zip
Convert blog plugin to use new privileges system
there is no user.is_admin anymore. Adapt to use the new privileges system.
Diffstat (limited to 'mediagoblin/media_types')
-rw-r--r--mediagoblin/media_types/blog/lib.py2
-rw-r--r--mediagoblin/media_types/blog/views.py6
2 files changed, 4 insertions, 4 deletions
diff --git a/mediagoblin/media_types/blog/lib.py b/mediagoblin/media_types/blog/lib.py
index 73ed6060..62696b55 100644
--- a/mediagoblin/media_types/blog/lib.py
+++ b/mediagoblin/media_types/blog/lib.py
@@ -24,7 +24,7 @@ def check_blog_slug_used(author_id, slug, ignore_b_id=None):
return does_exist
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 False
diff --git a/mediagoblin/media_types/blog/views.py b/mediagoblin/media_types/blog/views.py
index b8e1d845..cb34b490 100644
--- a/mediagoblin/media_types/blog/views.py
+++ b/mediagoblin/media_types/blog/views.py
@@ -221,7 +221,7 @@ def blog_dashboard(request, page):
blogs = request.db.Blog.query.filter_by(author=user.id)
config = pluginapi.get_config('mediagoblin.media_types.blog')
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:
blog = blogs.filter(Blog.slug==blog_slug).first()
if not blog:
@@ -316,7 +316,7 @@ def blog_delete(request, **kwargs):
return render_404(reequest)
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 form.confirm.data is True:
blog.delete()
@@ -331,7 +331,7 @@ def blog_delete(request, **kwargs):
return redirect(request, "mediagoblin.media_types.blog.blog_admin_dashboard",
user=request.user.username)
else:
- if request.user.is_admin:
+ if request.user.has_privilege(u'admin'):
add_message(
request, WARNING,
_("You are about to delete another user's Blog. "