From 3ea527660931f6cef1110d4d220755725888ff95 Mon Sep 17 00:00:00 2001 From: AnasBenjelloun Date: Fri, 12 Dec 2025 16:24:52 +0100 Subject: [PATCH] LUT-31276 Workgroup forms : automatic assignment to the group to which the user belongs --- .../lutece/plugins/forms/web/admin/FormJspBean.java | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/src/java/fr/paris/lutece/plugins/forms/web/admin/FormJspBean.java b/src/java/fr/paris/lutece/plugins/forms/web/admin/FormJspBean.java index badd71c98..9d38ce368 100644 --- a/src/java/fr/paris/lutece/plugins/forms/web/admin/FormJspBean.java +++ b/src/java/fr/paris/lutece/plugins/forms/web/admin/FormJspBean.java @@ -46,6 +46,7 @@ import javax.servlet.http.HttpServletRequest; import fr.paris.lutece.plugins.forms.business.StepHome; +import fr.paris.lutece.util.ReferenceItem; import org.apache.commons.fileupload.FileItem; import org.apache.commons.lang3.math.NumberUtils; @@ -318,9 +319,17 @@ public String getCreateForm( HttpServletRequest request ) throws AccessDeniedExc model.put( MARK_WORKFLOW_REF_LIST, referenceList ); } - ReferenceList workGroupReferenceList = AdminWorkgroupService.getUserWorkgroups(getUser(), getLocale()); + ReferenceList workGroupReferenceList = AdminWorkgroupService.getUserWorkgroups( getUser( ), getLocale( ) ); model.put( MARK_WORKGROUP_REF_LIST, workGroupReferenceList ); - model.put(FormsConstants.MARK_DEFAULT_VALUE_WORKGROUP_KEY, AdminWorkgroupService.ALL_GROUPS); + String strDefaultWorkGroup = AdminWorkgroupService.ALL_GROUPS; + if ( workGroupReferenceList.size( ) == 2 ) + { + strDefaultWorkGroup = workGroupReferenceList.stream( ).map( ReferenceItem::getCode ) + .filter( code -> !AdminWorkgroupService.ALL_GROUPS.equals( code ) ) + .findFirst( ) + .orElse( AdminWorkgroupService.ALL_GROUPS ); + } + model.put( FormsConstants.MARK_DEFAULT_VALUE_WORKGROUP_KEY, strDefaultWorkGroup ); if ( AccessControlService.getInstance( ).isAvailable( ) ) {