2025-summer/team-3
12
Fork 0
Code Issues Pull requests Projects Releases Activity

fixed permission handling for redermap manage command

Browse source
This commit is contained in:
Jenny Danzmayr 2024-08-13 03:44:32 +02:00
parent 3adff16bd8
commit edeec1eaf2
1 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/c3nav/mapdata/management/commands/rendermap.py
View file

@ -43,16 +43,16 @@ class Command(BaseCommand):
) )
@staticmethod @staticmethod
def permissions_value(value): def permissions_value(value) -> set[int]:
if value == '*': if value == '*':
return AccessRestriction.objects.all() return AccessRestriction.get_all()
if value == '0': if value == '0':
return () return AccessRestriction.get_all_public()
values = set(v for v in value.split(',') if v) values = set(v for v in value.split(',') if v)
permissions = AccessRestriction.objects.all().filter(pk__in=values) permissions = set(permission.pk for permission in AccessRestriction.objects.all().filter(pk__in=values))
not_found = values - set(str(permission.pk) for permission in permissions) not_found = values - set(map(str, permissions))
if not_found: if not_found:
raise argparse.ArgumentTypeError( raise argparse.ArgumentTypeError(
ngettext_lazy('Unknown access restriction: %s', ngettext_lazy('Unknown access restriction: %s',
@ -81,7 +81,7 @@ class Command(BaseCommand):
parser.add_argument('--theme', default=None, type=self.theme_value, parser.add_argument('--theme', default=None, type=self.theme_value,
help=_('theme to use, e.g. 2 or 0 for the default theme (default)')) help=_('theme to use, e.g. 2 or 0 for the default theme (default)'))
parser.add_argument('--permissions', default='0', type=self.permissions_value, parser.add_argument('--permissions', default='0', type=self.permissions_value,
help=_('permissions, e.g. 2,3 or * for all permissions or 0 for none (default)')) help=_('permissions, e.g. 2,3 or * for all permissions or 0 for public (default)'))
parser.add_argument('--full-levels', action='store_const', const=True, default=False, parser.add_argument('--full-levels', action='store_const', const=True, default=False,
help=_('render all levels completely')) help=_('render all levels completely'))
parser.add_argument('--no-center', action='store_const', const=True, default=False, parser.add_argument('--no-center', action='store_const', const=True, default=False,