Skip to content
Snippets Groups Projects
Commit 3188b960 authored by Roang's avatar Roang
Browse files

Fix permission names

parent f809e1e5
Branches
Tags
No related merge requests found
...@@ -181,13 +181,13 @@ class AssemblyMixin(ConferenceLoginRequiredMixin): ...@@ -181,13 +181,13 @@ class AssemblyMixin(ConferenceLoginRequiredMixin):
assembly = Assembly.objects.get(conference=self.conference, pk=self.request.resolver_match.kwargs.get(self.assembly_url_param)) assembly = Assembly.objects.get(conference=self.conference, pk=self.request.resolver_match.kwargs.get(self.assembly_url_param))
# check if it's the assembly team # check if it's the assembly team
if self.conferencemember.has_perms('assembly_team', require_staff=True): if self.conferencemember.has_perms('core.assembly_team', require_staff=True):
self._assembly_staff_access = True self._assembly_staff_access = True
self._staff_access = self._staff_access or assembly.state_assembly != Assembly.State.NONE self._staff_access = self._staff_access or assembly.state_assembly != Assembly.State.NONE
self._staff_mode = True self._staff_mode = True
# check if it's the channel team # check if it's the channel team
if self.conferencemember.has_perms('channel_team', require_staff=True): if self.conferencemember.has_perms('core.channel_team', require_staff=True):
self._channels_staff_access = True self._channels_staff_access = True
self._staff_access = self._staff_access or assembly.state_channel != Assembly.State.NONE self._staff_access = self._staff_access or assembly.state_channel != Assembly.State.NONE
self._staff_mode = True self._staff_mode = True
......
...@@ -402,7 +402,7 @@ class Assembly(TaggedItemMixin, models.Model): ...@@ -402,7 +402,7 @@ class Assembly(TaggedItemMixin, models.Model):
if not user.is_authenticated: if not user.is_authenticated:
return False return False
if staff_can_manage and user.has_conference_staff_permission(self.conference, 'assembly_team', 'channel_team'): if staff_can_manage and user.has_conference_staff_permission(self.conference, 'core.assembly_team', 'core.channel_team'):
return True return True
return self.members.filter(member=user, can_manage_assembly=True).exists() return self.members.filter(member=user, can_manage_assembly=True).exists()
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment