From 891326e076e861e99c5082b852daf069a87a508c Mon Sep 17 00:00:00 2001 From: ryoya-hayase Date: Thu, 26 Feb 2026 11:49:34 +0900 Subject: [PATCH] Fix GakuNin group config --- modules/weko-accounts/weko_accounts/config.py | 8 ++++---- modules/weko-index-tree/weko_index_tree/api.py | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/modules/weko-accounts/weko_accounts/config.py b/modules/weko-accounts/weko_accounts/config.py index 069f93dc57..bf7d1c00ae 100644 --- a/modules/weko-accounts/weko_accounts/config.py +++ b/modules/weko-accounts/weko_accounts/config.py @@ -227,11 +227,11 @@ WEKO_ACCOUNTS_GAKUNIN_GROUP_PATTERN_DICT = { "prefix":"jc", "sysadm_group":"jc_roles_sysadm", - "role_keyword":"roles", + "role_keyword":"ro", "role_mapping":{ - "repoadm":"Repository Administrator", - "comadm":"Community Administrator", - "contributor":"Contributor", + "radm":"Repository Administrator", + "cadm":"Community Administrator", + "cont":"Contributor", } } """Patterns for Gakunin group names.""" diff --git a/modules/weko-index-tree/weko_index_tree/api.py b/modules/weko-index-tree/weko_index_tree/api.py index 0b40d57b8e..909b97cfd9 100644 --- a/modules/weko-index-tree/weko_index_tree/api.py +++ b/modules/weko-index-tree/weko_index_tree/api.py @@ -859,13 +859,13 @@ def filter_roles(cls, roles): ) gakunin_map_prefix = gakunin_map_pattern.get("prefix", "jc") - role_keyword = gakunin_map_pattern.get("role_keyword", "roles") + role_keyword = gakunin_map_pattern.get("role_keyword", "ro") for role in roles: role_name = role.get("name", "") role_info = {"id": role.get("id"), "name": role_name} if role_name.startswith(gakunin_map_prefix): - if role_keyword in role_name: + if f"_{role_keyword}_" in role_name: # gakunin_map group role gakunin_map_role_groups.append(role) else: