From 70dc5ce82c86415ac7fa82ad0699a883d2f95491 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrej=20Rama=C5=A1euski?= <andrej@x2.cz>
Date: Tue, 17 Jan 2023 23:07:03 +0100
Subject: [PATCH] Prizpusobeni novy nazvum skupin, spravne mapovani roli
---
.gitlab-ci.yml | 2 +-
cf2022.conf | 2 ++
lib/CF2022/Helpers/Auth.pm | 2 +-
3 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index c035163..fbf02ae 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -2,7 +2,7 @@ image: docker:20.10.9
variables:
DOCKER_TLS_CERTDIR: "/certs"
- IMAGE_VER: 0.11.3
+ IMAGE_VER: 0.11.4
services:
- docker:20.10.9-dind
diff --git a/cf2022.conf b/cf2022.conf
index 8743c8e..9e291f9 100644
--- a/cf2022.conf
+++ b/cf2022.conf
@@ -10,5 +10,7 @@
pretix_qid_sso => 29, # identifikator otazky SSO UID
pretix_qid_region => 8, # identifikator otazky Kraj
pretix_qid_photo => 28, # identifikator otazky Foto
+ pretix_product_member => 1, # produkt pro cleny (NEMAPOVANY!)
+ pretix_product_regp => 2, # produkt pro regp (NEMAPOVANY!)
mail_domain => 'pirati.cz',
}
diff --git a/lib/CF2022/Helpers/Auth.pm b/lib/CF2022/Helpers/Auth.pm
index da31c9f..f6206b6 100644
--- a/lib/CF2022/Helpers/Auth.pm
+++ b/lib/CF2022/Helpers/Auth.pm
@@ -83,7 +83,7 @@ sub register ( $class, $self, $conf) {
my $role = ( $2 eq 'f') ? 'member':'regp';
my $region = $c->oauth_groups->{ $group };
- $region =~ s/^KS\s+//i;
+ $region =~ s/^K[SF]\s+//i;
return {
region => $region,
--
GitLab