Hopiu/wagtail
1
0
Fork 0
mirror of https://github.com/Hopiu/wagtail.git synced 2026-03-29 20:30:40 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix app label for site permissions - should be 'wagtailcore', not 'site'

Browse source
This commit is contained in:
Matt Westcott 2015-07-21 15:58:34 +01:00
parent d4259e133b
commit fa230de03b
4 changed files with 13 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
wagtail/wagtailsites/templates/wagtailsites/edit.html
View file

@ -21,7 +21,7 @@
<li>
<input type="submit" value="{% trans 'Save' %}" />
{% if perms.site.delete_site %}
{% if perms.wagtailcore.delete_site %}
<a href="{% url 'wagtailsites:delete' site.id %}" class="button button-secondary no">{% trans "Delete site" %}</a>
{% endif %}
</li>

2
wagtail/wagtailsites/templates/wagtailsites/index.html
View file

@ -3,7 +3,7 @@
{% block titletag %}{% trans "Sites" %}{% endblock %}
{% block content %}
{% trans "Sites" as sites_str %}
{% if perms.site.add_site %}
{% if perms.wagtailcore.add_site %}
{% trans "Add a site" as add_a_site_str %}
{% include "wagtailadmin/shared/header.html" with title=sites_str add_link="wagtailsites:add" add_text=add_a_site_str icon="site" %}
{% else %}

9
wagtail/wagtailsites/views.py
View file

@ -7,9 +7,10 @@ from wagtail.wagtailcore.models import Site
from wagtail.wagtailsites.forms import SiteForm
from wagtail.wagtailadmin import messages
def user_has_site_model_perm(user):
for verb in ['add', 'change', 'delete']:
if user.has_perm('site.%s_site' % verb):
if user.has_perm('wagtailcore.%s_site' % verb):
return True
return False
@ -22,7 +23,7 @@ def index(request):
})
@permission_required('site.add_site')
@permission_required('wagtailcore.add_site')
def create(request):
if request.POST:
form = SiteForm(request.POST)
@ -42,7 +43,7 @@ def create(request):
})
@permission_required('site.change_site')
@permission_required('wagtailcore.change_site')
def edit(request, site_id):
site = get_object_or_404(Site, id=site_id)
@ -65,7 +66,7 @@ def edit(request, site_id):
})
@permission_required('site.delete_site')
@permission_required('wagtailcore.delete_site')
def delete(request, site_id):
site = get_object_or_404(Site, id=site_id)

7
wagtail/wagtailsites/wagtail_hooks.py
View file

@ -17,7 +17,12 @@ def register_admin_urls():
class SitesMenuItem(MenuItem):
def is_shown(self, request):
return request.user.is_superuser
return (
request.user.has_perm('wagtailcore.add_site')
or request.user.has_perm('wagtailcore.edit_site')
or request.user.has_perm('wagtailcore.delete_site')
)
@hooks.register('register_settings_menu_item')
def register_sites_menu_item():