diff --git a/src/java/fr/paris/lutece/plugins/forms/web/entrytype/EntryTypeDefaultDisplayService.java b/src/java/fr/paris/lutece/plugins/forms/web/entrytype/EntryTypeDefaultDisplayService.java index 6996815a..1b4b367c 100644 --- a/src/java/fr/paris/lutece/plugins/forms/web/entrytype/EntryTypeDefaultDisplayService.java +++ b/src/java/fr/paris/lutece/plugins/forms/web/entrytype/EntryTypeDefaultDisplayService.java @@ -46,7 +46,10 @@ import fr.paris.lutece.plugins.genericattributes.business.Entry; import fr.paris.lutece.plugins.genericattributes.service.entrytype.EntryTypeServiceManager; import fr.paris.lutece.plugins.genericattributes.service.entrytype.IEntryTypeService; +import fr.paris.lutece.portal.service.editor.RichTextContentService; +import fr.paris.lutece.portal.service.editor.RichTextParsingException; import fr.paris.lutece.portal.service.template.AppTemplateService; +import fr.paris.lutece.portal.service.util.AppLogService; /** * The default display service @@ -78,9 +81,17 @@ public EntryTypeDefaultDisplayService( String strEntryServiceName ) */ private Map setModel( Entry entry, Map model ) { - model.put( FormsConstants.QUESTION_ENTRY_MARKER, entry ); - - return model; + try + { + entry.setComment( RichTextContentService.getContent( entry.getComment( ) ) ); + model.put( FormsConstants.QUESTION_ENTRY_MARKER, entry ); + return model; + } + catch (RichTextParsingException e) + { + AppLogService.error(e.getMessage(), e); + return model; + } } /** diff --git a/webapp/WEB-INF/templates/admin/plugins/forms/entries/create_entry_type_auto_file_reading.html b/webapp/WEB-INF/templates/admin/plugins/forms/entries/create_entry_type_auto_file_reading.html index 17dbfdfa..00fe0f82 100644 --- a/webapp/WEB-INF/templates/admin/plugins/forms/entries/create_entry_type_auto_file_reading.html +++ b/webapp/WEB-INF/templates/admin/plugins/forms/entries/create_entry_type_auto_file_reading.html @@ -70,7 +70,5 @@ -<#include "/admin/util/editor/editor.html" /> -<@initEditor /> <@anonymPattern /> \ No newline at end of file diff --git a/webapp/WEB-INF/templates/admin/plugins/forms/entries/create_entry_type_camera.html b/webapp/WEB-INF/templates/admin/plugins/forms/entries/create_entry_type_camera.html index ac8a5061..6aeeb619 100644 --- a/webapp/WEB-INF/templates/admin/plugins/forms/entries/create_entry_type_camera.html +++ b/webapp/WEB-INF/templates/admin/plugins/forms/entries/create_entry_type_camera.html @@ -73,6 +73,4 @@ -<#include "/admin/util/editor/editor.html" /> -<@initEditor /> <@anonymPattern /> diff --git a/webapp/WEB-INF/templates/admin/plugins/forms/entries/create_entry_type_cartography.html b/webapp/WEB-INF/templates/admin/plugins/forms/entries/create_entry_type_cartography.html index d1ea6376..48472da5 100644 --- a/webapp/WEB-INF/templates/admin/plugins/forms/entries/create_entry_type_cartography.html +++ b/webapp/WEB-INF/templates/admin/plugins/forms/entries/create_entry_type_cartography.html @@ -99,6 +99,4 @@ }); }) -<#include "/admin/util/editor/editor.html" /> -<@initEditor /> <@anonymPattern /> diff --git a/webapp/WEB-INF/templates/admin/plugins/forms/entries/create_entry_type_check_box.html b/webapp/WEB-INF/templates/admin/plugins/forms/entries/create_entry_type_check_box.html index d8432acc..a0eaeeb2 100644 --- a/webapp/WEB-INF/templates/admin/plugins/forms/entries/create_entry_type_check_box.html +++ b/webapp/WEB-INF/templates/admin/plugins/forms/entries/create_entry_type_check_box.html @@ -69,8 +69,4 @@ - - -<#include "/admin/util/editor/editor.html" /> -<@initEditor /> - \ No newline at end of file + \ No newline at end of file diff --git a/webapp/WEB-INF/templates/admin/plugins/forms/entries/create_entry_type_comment.html b/webapp/WEB-INF/templates/admin/plugins/forms/entries/create_entry_type_comment.html index 67a3d7e3..42826e34 100644 --- a/webapp/WEB-INF/templates/admin/plugins/forms/entries/create_entry_type_comment.html +++ b/webapp/WEB-INF/templates/admin/plugins/forms/entries/create_entry_type_comment.html @@ -51,7 +51,5 @@ - <#include "/admin/util/editor/editor.html" /> -<@initEditor /> - \ No newline at end of file +<@initEditor /> \ No newline at end of file diff --git a/webapp/WEB-INF/templates/admin/plugins/forms/entries/create_entry_type_date.html b/webapp/WEB-INF/templates/admin/plugins/forms/entries/create_entry_type_date.html index 3725b0e9..388b8ffd 100644 --- a/webapp/WEB-INF/templates/admin/plugins/forms/entries/create_entry_type_date.html +++ b/webapp/WEB-INF/templates/admin/plugins/forms/entries/create_entry_type_date.html @@ -75,8 +75,5 @@ - -<#include "/admin/util/editor/editor.html" /> -<@initEditor /> <@anonymPattern /> <@toDayDate /> diff --git a/webapp/WEB-INF/templates/admin/plugins/forms/entries/create_entry_type_file.html b/webapp/WEB-INF/templates/admin/plugins/forms/entries/create_entry_type_file.html index e384f999..af6531ac 100644 --- a/webapp/WEB-INF/templates/admin/plugins/forms/entries/create_entry_type_file.html +++ b/webapp/WEB-INF/templates/admin/plugins/forms/entries/create_entry_type_file.html @@ -69,8 +69,6 @@ -<#include "/admin/util/editor/editor.html" /> -<@initEditor /> <@anonymPattern /> -<#include "/admin/util/editor/editor.html" /> -<@initEditor /> <@anonymPattern /> diff --git a/webapp/WEB-INF/templates/admin/plugins/forms/entries/create_entry_type_image.html b/webapp/WEB-INF/templates/admin/plugins/forms/entries/create_entry_type_image.html index fd93af3f..8c70dd2c 100644 --- a/webapp/WEB-INF/templates/admin/plugins/forms/entries/create_entry_type_image.html +++ b/webapp/WEB-INF/templates/admin/plugins/forms/entries/create_entry_type_image.html @@ -72,8 +72,4 @@ - -<#include "/admin/util/editor/editor.html" /> -<@initEditor /> - <@anonymPattern /> - \ No newline at end of file +<@anonymPattern /> \ No newline at end of file diff --git a/webapp/WEB-INF/templates/admin/plugins/forms/entries/create_entry_type_number.html b/webapp/WEB-INF/templates/admin/plugins/forms/entries/create_entry_type_number.html index b9d87e23..fec343bc 100644 --- a/webapp/WEB-INF/templates/admin/plugins/forms/entries/create_entry_type_number.html +++ b/webapp/WEB-INF/templates/admin/plugins/forms/entries/create_entry_type_number.html @@ -91,9 +91,7 @@ - -<#include "/admin/util/editor/editor.html" /> -<@initEditor /> + -<@initEditor /> \ No newline at end of file + \ No newline at end of file diff --git a/webapp/WEB-INF/templates/admin/plugins/forms/entries/create_entry_type_text.html b/webapp/WEB-INF/templates/admin/plugins/forms/entries/create_entry_type_text.html index cb4eff84..60b08b7c 100644 --- a/webapp/WEB-INF/templates/admin/plugins/forms/entries/create_entry_type_text.html +++ b/webapp/WEB-INF/templates/admin/plugins/forms/entries/create_entry_type_text.html @@ -87,8 +87,5 @@ -<#include "/admin/util/editor/editor.html" /> <@confirmField /> -<@anonymPattern /> -<@initEditor /> - \ No newline at end of file +<@anonymPattern /> \ No newline at end of file diff --git a/webapp/WEB-INF/templates/admin/plugins/forms/entries/create_entry_type_text_area.html b/webapp/WEB-INF/templates/admin/plugins/forms/entries/create_entry_type_text_area.html index d3d7ec46..bb553b03 100644 --- a/webapp/WEB-INF/templates/admin/plugins/forms/entries/create_entry_type_text_area.html +++ b/webapp/WEB-INF/templates/admin/plugins/forms/entries/create_entry_type_text_area.html @@ -85,7 +85,4 @@ -<#include "/admin/util/editor/editor.html" /> -<@anonymPattern /> -<@initEditor /> - \ No newline at end of file +<@anonymPattern /> \ No newline at end of file diff --git a/webapp/WEB-INF/templates/admin/plugins/forms/entries/modify_entry_type_array.html b/webapp/WEB-INF/templates/admin/plugins/forms/entries/modify_entry_type_array.html index aaa7683e..5db1bd4b 100644 --- a/webapp/WEB-INF/templates/admin/plugins/forms/entries/modify_entry_type_array.html +++ b/webapp/WEB-INF/templates/admin/plugins/forms/entries/modify_entry_type_array.html @@ -1,4 +1,3 @@ -<#include "all_entry_commons.html" /> <#include "/admin/util/editor/editor.html" /> ${breadcrumb_template} @@ -101,5 +100,4 @@ -<@initEditor /> -<@anonymPattern /> +<@anonymPattern /> \ No newline at end of file diff --git a/webapp/WEB-INF/templates/admin/plugins/forms/entries/modify_entry_type_auto_file_reading.html b/webapp/WEB-INF/templates/admin/plugins/forms/entries/modify_entry_type_auto_file_reading.html index 96c12d82..bc0bc03c 100644 --- a/webapp/WEB-INF/templates/admin/plugins/forms/entries/modify_entry_type_auto_file_reading.html +++ b/webapp/WEB-INF/templates/admin/plugins/forms/entries/modify_entry_type_auto_file_reading.html @@ -1,5 +1,4 @@ <#include "all_entry_commons.html" /> -<#include "/admin/util/editor/editor.html" /> ${breadcrumb_template} <@row> @@ -95,5 +94,4 @@ ${ocr_mapping_template!} -<@initEditor /> -<@anonymPattern /> +<@anonymPattern /> \ No newline at end of file diff --git a/webapp/WEB-INF/templates/admin/plugins/forms/entries/modify_entry_type_camera.html b/webapp/WEB-INF/templates/admin/plugins/forms/entries/modify_entry_type_camera.html index f9804937..cf1b3517 100644 --- a/webapp/WEB-INF/templates/admin/plugins/forms/entries/modify_entry_type_camera.html +++ b/webapp/WEB-INF/templates/admin/plugins/forms/entries/modify_entry_type_camera.html @@ -94,6 +94,4 @@ -<#include "/admin/util/editor/editor.html" /> <@anonymPattern /> -<@initEditor /> diff --git a/webapp/WEB-INF/templates/admin/plugins/forms/entries/modify_entry_type_cartography.html b/webapp/WEB-INF/templates/admin/plugins/forms/entries/modify_entry_type_cartography.html index 6d1b54c5..ad2db336 100644 --- a/webapp/WEB-INF/templates/admin/plugins/forms/entries/modify_entry_type_cartography.html +++ b/webapp/WEB-INF/templates/admin/plugins/forms/entries/modify_entry_type_cartography.html @@ -1,6 +1,5 @@ <#include "all_entry_commons.html" /> -<#include "/admin/util/editor/editor.html" /> ${breadcrumb_template} <@row> @@ -116,5 +115,4 @@ } }); }) - - <@initEditor /> \ No newline at end of file + \ No newline at end of file diff --git a/webapp/WEB-INF/templates/admin/plugins/forms/entries/modify_entry_type_check_box.html b/webapp/WEB-INF/templates/admin/plugins/forms/entries/modify_entry_type_check_box.html index 93e0cb51..f8e1e2ad 100644 --- a/webapp/WEB-INF/templates/admin/plugins/forms/entries/modify_entry_type_check_box.html +++ b/webapp/WEB-INF/templates/admin/plugins/forms/entries/modify_entry_type_check_box.html @@ -1,6 +1,5 @@ <#include "all_entry_commons.html" /> -<#include "/admin/util/editor/editor.html" /> ${breadcrumb_template} <@row> @@ -148,5 +147,4 @@ - -<@initEditor /> + \ No newline at end of file diff --git a/webapp/WEB-INF/templates/admin/plugins/forms/entries/modify_entry_type_date.html b/webapp/WEB-INF/templates/admin/plugins/forms/entries/modify_entry_type_date.html index 48fefe30..6a64a3ad 100644 --- a/webapp/WEB-INF/templates/admin/plugins/forms/entries/modify_entry_type_date.html +++ b/webapp/WEB-INF/templates/admin/plugins/forms/entries/modify_entry_type_date.html @@ -1,7 +1,5 @@ <#include "all_entry_commons.html" /> -<#include "/admin/util/editor/editor.html" /> - ${breadcrumb_template} <@row> <@columns> @@ -99,5 +97,4 @@ <@anonymPattern /> -<@initEditor /> <@toDayDate /> diff --git a/webapp/WEB-INF/templates/admin/plugins/forms/entries/modify_entry_type_file.html b/webapp/WEB-INF/templates/admin/plugins/forms/entries/modify_entry_type_file.html index 18717e1f..0cc78a96 100644 --- a/webapp/WEB-INF/templates/admin/plugins/forms/entries/modify_entry_type_file.html +++ b/webapp/WEB-INF/templates/admin/plugins/forms/entries/modify_entry_type_file.html @@ -1,5 +1,4 @@ <#include "all_entry_commons.html" /> -<#include "/admin/util/editor/editor.html" /> ${breadcrumb_template} <@row> @@ -84,7 +83,6 @@ -<@initEditor /> <@anonymPattern /> - <@initEditor /> \ No newline at end of file + \ No newline at end of file diff --git a/webapp/WEB-INF/templates/admin/plugins/forms/entries/modify_entry_type_group.html b/webapp/WEB-INF/templates/admin/plugins/forms/entries/modify_entry_type_group.html index 1335ed47..eaca617f 100644 --- a/webapp/WEB-INF/templates/admin/plugins/forms/entries/modify_entry_type_group.html +++ b/webapp/WEB-INF/templates/admin/plugins/forms/entries/modify_entry_type_group.html @@ -1,6 +1,5 @@ <#include "all_entry_commons.html" /> -<#include "/admin/util/editor/editor.html" /> ${breadcrumb_template} @@ -77,7 +76,6 @@ -<@initEditor /> -<@initEditor /> \ No newline at end of file + \ No newline at end of file diff --git a/webapp/WEB-INF/templates/admin/plugins/forms/entries/modify_entry_type_text.html b/webapp/WEB-INF/templates/admin/plugins/forms/entries/modify_entry_type_text.html index 2a90b2ad..0fd0bf51 100644 --- a/webapp/WEB-INF/templates/admin/plugins/forms/entries/modify_entry_type_text.html +++ b/webapp/WEB-INF/templates/admin/plugins/forms/entries/modify_entry_type_text.html @@ -1,6 +1,5 @@ <#include "all_entry_commons.html" /> -<#include "/admin/util/editor/editor.html" /> ${breadcrumb_template} <@row> <@columns> @@ -135,5 +134,4 @@ <@confirmField /> -<@anonymPattern /> -<@initEditor /> \ No newline at end of file +<@anonymPattern /> \ No newline at end of file