Skip to content

Commit

Permalink
Only check permissions if permissions are enabled.
Browse files Browse the repository at this point in the history
  • Loading branch information
stephrdev committed Aug 19, 2011
1 parent d8b7027 commit c8312f7
Show file tree
Hide file tree
Showing 2 changed files with 19 additions and 10 deletions.
22 changes: 15 additions & 7 deletions cms/templatetags/cms_admin.py
Original file line number Diff line number Diff line change
Expand Up @@ -80,13 +80,21 @@ def boolean_icon(value):

@register.filter
def is_restricted(page, request):
all_perms = get_any_page_view_permissions(request, page)
icon = boolean_icon(all_perms.exists())
return mark_safe(
ugettext('<span title="Restrictions: %(title)s">%(icon)s</span>') % {
'title': u', '.join((perm.get_grant_on_display() for perm in all_perms)) or None,
'icon': icon,
})
if settings.CMS_PERMISSION:
all_perms = get_any_page_view_permissions(request, page)
icon = boolean_icon(all_perms.exists())
return mark_safe(
ugettext('<span title="Restrictions: %(title)s">%(icon)s</span>') % {
'title': u', '.join((perm.get_grant_on_display() for perm in all_perms)) or None,
'icon': icon,
})
else:
icon = boolean_icon(None)
return mark_safe(
ugettext('<span title="Restrictions: %(title)s">%(icon)s</span>') % {
'title': None,
'icon': icon,
})

@register.filter
def moderator_choices(page, user):
Expand Down
7 changes: 4 additions & 3 deletions cms/utils/admin.py
Original file line number Diff line number Diff line change
Expand Up @@ -41,9 +41,10 @@ def get_admin_menu_item_context(request, page, filtered=False):
moderator_state = moderator.page_moderator_state(request, page)
has_add_on_same_level_permission = False
opts = Page._meta
if (request.user.has_perm(opts.app_label + '.' + opts.get_add_permission()) and
GlobalPagePermission.objects.with_user(request.user).filter(can_add=True, sites__in=[page.site_id])):
has_add_on_same_level_permission = True
if settings.CMS_PERMISSION:
if (request.user.has_perm(opts.app_label + '.' + opts.get_add_permission()) and
GlobalPagePermission.objects.with_user(request.user).filter(can_add=True, sites__in=[page.site_id])):
has_add_on_same_level_permission = True

if not has_add_on_same_level_permission and page.parent_id:
has_add_on_same_level_permission = permissions.has_generic_permission(page.parent_id, request.user, "add", page.site)
Expand Down

0 comments on commit c8312f7

Please sign in to comment.