Skip to content
Snippets Groups Projects
Commit 8b8886b2 authored by Tomáš Valenta's avatar Tomáš Valenta
Browse files

multiple default staff groups

parent 405144b2
No related branches found
No related tags found
No related merge requests found
Pipeline #12303 passed
......@@ -28,7 +28,7 @@ RUN DATABASE_URL=postgres://x/x \
DEFAULT_CONTRACTEE_ZIP=x \
DEFAULT_CONTRACTEE_DISTRICT=x \
DEFAULT_CONTRACTEE_ICO_NUMBER=x \
DEFAULT_STAFF_GROUP=x \
DEFAULT_STAFF_GROUPS=x \
python manage.py collectstatic --noinput --settings=registry.settings.production
RUN bash -c "adduser --disabled-login --quiet --gecos app app && \
......
......@@ -19,4 +19,4 @@ DEFAULT_CONTRACTEE_ZIP="128 00"
DEFAULT_CONTRACTEE_DISTRICT="Praha 2"
DEFAULT_CONTRACTEE_ICO_NUMBER="71339698"
DEFAULT_STAFF_GROUP="sso_cen:f"
DEFAULT_STAFF_GROUP="sso_cen:f,sso_cen:neverejni,sso_cen:smlouvy_ao,sso_cen:registr_smluv"
......@@ -232,4 +232,4 @@ DEFAULT_CONTRACTEE_DISTRICT = env.str("DEFAULT_CONTRACTEE_DISTRICT")
DEFAULT_COUNTRY = env.str("DEFAULT_COUNTRY")
DEFAULT_CONTRACTEE_ICO_NUMBER = env.str("DEFAULT_CONTRACTEE_ICO_NUMBER")
DEFAULT_STAFF_GROUP = env.str("DEFAULT_STAFF_GROUP")
DEFAULT_STAFF_GROUPS = env.list("DEFAULT_STAFF_GROUPS")
......@@ -109,7 +109,7 @@ class User(pirates_models.AbstractUser):
self.is_staff_based_on_group = True
is_staff = self.groups.filter(name=settings.DEFAULT_STAFF_GROUP).exists()
is_staff = self.groups.filter(name__in=settings.DEFAULT_STAFF_GROUPS).exists()
changes_made = False
if is_staff is not self.is_staff:
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment