From 8504ca1381911071bf4310d82c75b89d4dd95b42 Mon Sep 17 00:00:00 2001 From: obfromevi Date: Fri, 29 Mar 2024 11:55:17 +0100 Subject: [PATCH] LUT-26684 : export the title instead of the value of the checkbox and radio buttons in the CSV file --- .../entrytype/AbstractEntryTypeCheckBox.java | 9 +++++++++ .../entrytype/AbstractEntryTypeChoice.java | 20 +++++++++++++++++++ .../AbstractEntryTypeRadioButton.java | 9 +++++++++ 3 files changed, 38 insertions(+) diff --git a/src/java/fr/paris/lutece/plugins/genericattributes/service/entrytype/AbstractEntryTypeCheckBox.java b/src/java/fr/paris/lutece/plugins/genericattributes/service/entrytype/AbstractEntryTypeCheckBox.java index da843a92..bc790bba 100644 --- a/src/java/fr/paris/lutece/plugins/genericattributes/service/entrytype/AbstractEntryTypeCheckBox.java +++ b/src/java/fr/paris/lutece/plugins/genericattributes/service/entrytype/AbstractEntryTypeCheckBox.java @@ -196,4 +196,13 @@ public GenericAttributeError getResponseData( Entry entry, HttpServletRequest re return null; } + + /** + * {@inheritDoc} + */ + @Override + public String getResponseValueForExport( Entry entry, HttpServletRequest request, Response response, Locale locale ) + { + return getFieldTitleFromResponse( response ); + } } diff --git a/src/java/fr/paris/lutece/plugins/genericattributes/service/entrytype/AbstractEntryTypeChoice.java b/src/java/fr/paris/lutece/plugins/genericattributes/service/entrytype/AbstractEntryTypeChoice.java index ed2947b1..dc4c102e 100644 --- a/src/java/fr/paris/lutece/plugins/genericattributes/service/entrytype/AbstractEntryTypeChoice.java +++ b/src/java/fr/paris/lutece/plugins/genericattributes/service/entrytype/AbstractEntryTypeChoice.java @@ -131,4 +131,24 @@ protected String createFieldsUseRefList( Entry entry, HttpServletRequest request } return null; } + + public String getFieldTitleFromResponse( Response response ) + { + if ( response != null && response.getField( ) != null ) + { + Field field = response.getField( ); + if ( field.getTitle( ) == null ) + { + Field updatedField = FieldHome.findByPrimaryKey( field.getIdField( ) ); + if ( updatedField != null ) + { + response.setField( updatedField ); + } + } + + return response.getField( ).getTitle( ); + } + + return null; + } } diff --git a/src/java/fr/paris/lutece/plugins/genericattributes/service/entrytype/AbstractEntryTypeRadioButton.java b/src/java/fr/paris/lutece/plugins/genericattributes/service/entrytype/AbstractEntryTypeRadioButton.java index fc354d83..b922b9a4 100644 --- a/src/java/fr/paris/lutece/plugins/genericattributes/service/entrytype/AbstractEntryTypeRadioButton.java +++ b/src/java/fr/paris/lutece/plugins/genericattributes/service/entrytype/AbstractEntryTypeRadioButton.java @@ -164,4 +164,13 @@ public GenericAttributeError getResponseData( Entry entry, HttpServletRequest re return null; } + + /** + * {@inheritDoc} + */ + @Override + public String getResponseValueForExport( Entry entry, HttpServletRequest request, Response response, Locale locale ) + { + return getFieldTitleFromResponse( response ); + } }