From bca69e249f7af66f4dbf0338755be87d0e9ad91d Mon Sep 17 00:00:00 2001 From: Felix Dupriez Date: Mon, 5 Sep 2022 16:35:09 +0200 Subject: [PATCH] FORMS-833 : Migrate the provider of the marker value of the url for a formResponse to the module notifygru forms --- .../provider/GenericFormsProvider.java | 33 ------------------- 1 file changed, 33 deletions(-) diff --git a/src/java/fr/paris/lutece/plugins/forms/service/provider/GenericFormsProvider.java b/src/java/fr/paris/lutece/plugins/forms/service/provider/GenericFormsProvider.java index 1bdce15ed..c76c8c1a9 100644 --- a/src/java/fr/paris/lutece/plugins/forms/service/provider/GenericFormsProvider.java +++ b/src/java/fr/paris/lutece/plugins/forms/service/provider/GenericFormsProvider.java @@ -54,7 +54,6 @@ import fr.paris.lutece.plugins.forms.business.QuestionHome; import fr.paris.lutece.plugins.forms.service.entrytype.EntryTypeComment; import fr.paris.lutece.plugins.forms.util.FormsConstants; -import fr.paris.lutece.plugins.forms.web.admin.MultiviewFormResponseDetailsJspBean; import fr.paris.lutece.plugins.genericattributes.business.Entry; import fr.paris.lutece.plugins.genericattributes.business.Field; import fr.paris.lutece.plugins.genericattributes.service.entrytype.EntryTypeServiceManager; @@ -67,24 +66,18 @@ import fr.paris.lutece.portal.service.i18n.I18nService; import fr.paris.lutece.portal.service.util.AppLogService; import fr.paris.lutece.portal.service.util.AppPathService; -import fr.paris.lutece.portal.service.util.AppPropertiesService; import fr.paris.lutece.util.url.UrlItem; public abstract class GenericFormsProvider implements IProvider { - // MESSAGE - private static final String MESSAGE_DESCRIPTION = "forms.marker.provider.url.admin.detail.reponse.description"; private static final String MESSAGE_FO_DESCRIPTION = "forms.marker.provider.url.fo.detail.reponse.description"; private static final String MESSAGE_CREATION_DATE = "forms.marker.provider.url.detail.reponse.creation_date"; private static final String MESSAGE_UPDATE_DATE = "forms.marker.provider.url.detail.reponse.update_date"; private static final String MESSAGE_STATUS = "forms.marker.provider.url.detail.reponse.status"; private static final String MESSAGE_STATUS_UPDATE_DATE = "forms.marker.provider.url.detail.reponse.status_update_date"; - // PROPERTY - private static final String PROPERTY_LUTECE_ADMIN_PROD_URL = "lutece.admin.prod.url"; // MARKS private static final String MARK_POSITION = "position_"; - private static final String MARK_URL_ADMIN_RESPONSE = "url_admin_forms_response_detail"; private static final String MARK_URL_FO_RESPONSE = "url_fo_forms_response_detail"; private static final String MARK_CREATION_DATE = "creation_date"; private static final String MARK_UPDATE_DATE = "update_date"; @@ -171,30 +164,7 @@ public Collection provideMarkerValues( ) AppLogService.debug( "Adding infomarker " + notifyMarker.getMarker( ) + "=" + notifyMarker.getValue( ) ); } result.addAll( markers.values( ) ); - - InfoMarker notifyMarkerAdminUrl = new InfoMarker( MARK_URL_ADMIN_RESPONSE ); - UrlItem adminUrl = new UrlItem( AppPropertiesService.getProperty( PROPERTY_LUTECE_ADMIN_PROD_URL ) + MultiviewFormResponseDetailsJspBean.CONTROLLER_JSP_NAME_WITH_PATH ); - adminUrl.addParameter( FormsConstants.PARAMETER_TARGET_VIEW, PARAMETER_VIEW_FORM_RESPONSE_DETAILS ); - adminUrl.addParameter( PARAMETER_ID_FORM_RESPONSES, _formResponse.getId( ) ); - notifyMarkerAdminUrl.setValue( adminUrl.getUrl( ) ); - result.add( notifyMarkerAdminUrl ); - - InfoMarker notifyMarkerFOUrl = new InfoMarker( MARK_URL_FO_RESPONSE ); - UrlItem url = new UrlItem( AppPathService.getProdUrl( _request ) + AppPathService.getPortalUrl( ) ); - url.addParameter( FormsConstants.PARAMETER_PAGE, PARAMETER_PAGE_FORM_RESPONSE ); - url.addParameter( FormsConstants.PARAMETER_TARGET_VIEW, PARAMETER_VIEW_FORM_RESPONSE_DETAILS_FO ); - url.addParameter( PARAMETER_ID_FORM_RESPONSES_FO, _formResponse.getId( ) ); - notifyMarkerFOUrl.setValue( url.getUrl( ) ); - result.add( notifyMarkerFOUrl ); - InfoMarker creationDateMarker = new InfoMarker( MARK_CREATION_DATE ); - creationDateMarker.setValue( _formResponse.getCreation( ).toString( ) ); - InfoMarker updateDateMarker = new InfoMarker( MARK_UPDATE_DATE ); - updateDateMarker.setValue( _formResponse.getCreation( ).toString( ) ); - InfoMarker statusMarker = new InfoMarker( MARK_STATUS ); - statusMarker.setValue( String.valueOf( _formResponse.isPublished( ) ) ); - InfoMarker updateStatusDateMarker = new InfoMarker( MARK_STATUS_UPDATE_DATE ); - updateStatusDateMarker.setValue( _formResponse.getUpdateStatus( ).toString( ) ); return result; } @@ -217,9 +187,6 @@ public static Collection getProviderMarkerDescriptions( Form form ) notifyMarker.setDescription( formQuestion.getTitle( ) ); collectionNotifyMarkers.add( notifyMarker ); } - InfoMarker notifyMarkerAdminURl = new InfoMarker( MARK_URL_ADMIN_RESPONSE ); - notifyMarkerAdminURl.setDescription( I18nService.getLocalizedString( MESSAGE_DESCRIPTION, I18nService.getDefaultLocale( ) ) ); - collectionNotifyMarkers.add( notifyMarkerAdminURl ); InfoMarker notifyMarkerFOURl = new InfoMarker( MARK_URL_FO_RESPONSE ); notifyMarkerFOURl.setDescription( I18nService.getLocalizedString( MESSAGE_FO_DESCRIPTION, I18nService.getDefaultLocale( ) ) );