diff --git a/Dockerfile b/Dockerfile index a5bcb9db7f3b4498b359f21a9f73540e8d5a2fda..ce121586502dc8cd65ed6c9387a44ace785af2f2 100644 --- a/Dockerfile +++ b/Dockerfile @@ -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 && \ diff --git a/env.example b/env.example index 797ac95162181c06256e0ad1eb8ae301f29546c3..a493ff1f3a0b286adb53915f3e19c9f8a06cbfb3 100644 --- a/env.example +++ b/env.example @@ -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" diff --git a/registry/settings/base.py b/registry/settings/base.py index f86b3d659f67140cb21f313f4ba52ff1d6e5cfff..a95d5647e4b725357ea4de019470171b28fd636a 100644 --- a/registry/settings/base.py +++ b/registry/settings/base.py @@ -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") diff --git a/users/models.py b/users/models.py index f449ddec2322306734b21a6a073aaa2149b14bcd..e9332ea84b61f7e978f30b131fd6ecffbcc813c6 100644 --- a/users/models.py +++ b/users/models.py @@ -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: