Skip to content

LUT-26253 : SONAR #271

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 4 commits into
base: develop
Choose a base branch
from
Open

LUT-26253 : SONAR #271

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
51eae05
LUT-26249 : SONAR - Strings and Boxed types should be compared using …
TimotheeHrl Sep 14, 2023
63d1ff5
LUT-26253 : SONAR - Strings and Boxed types should be compared using …
TimotheeHrl Sep 14, 2023
764eb30
LUT-26253 : SONAR - String literals should not be duplicated
TimotheeHrl Sep 14, 2023
8882ff8
Merge remote-tracking branch 'origin/LUT-26253' into LUT-26253
TimotheeHrl Sep 14, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions src/java/fr/paris/lutece/plugins/forms/web/admin/FormControlJspBean.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,6 +134,7 @@ public class FormControlJspBean extends AbstractJspBean
private static final String MARK_LOGICAL_OPERATORS_LIST = "logicalOperators";
private static final String MARK_PAGINATOR = "paginator";
private static final String MARK_NB_ITEMS_PER_PAGE = "nb_items_per_page";
private static final String MARK_NEXT_STEP_TITLE = "nextStepTitle";

private static final String PARAMETER_PAGE_INDEX = "page_index";

Expand Down Expand Up @@ -178,7 +179,7 @@ public String getManageControl( HttpServletRequest request )
Map<String, Object> model = getModel( );
if(_controlType == ControlType.TRANSITION) {
Transition transition = TransitionHome.findByPrimaryKey( _nIdTarget );
model.put( "nextStepTitle", StepHome.findByPrimaryKey( transition.getNextStep() ).getTitle( ) );
model.put( MARK_NEXT_STEP_TITLE, StepHome.findByPrimaryKey( transition.getNextStep() ).getTitle( ) );
}
model.put( MARK_PAGINATOR, paginator );
model.put( MARK_NB_ITEMS_PER_PAGE, StringUtils.EMPTY + _nItemsPerPage );
Expand Down Expand Up @@ -544,8 +545,9 @@ private void buildControlModel( HttpServletRequest request, Map<String, Object>
IValidator validator = EntryServiceManager.getInstance( ).getValidator( _control.getValidatorName( ) );
strValidatorTemplate = validator.getDisplayHtml( _control );
}
if(_controlType.name() == "TRANSITION") {
model.put("nextStepTitle", request.getParameter("nextStepTitle"));
if(_controlType.name().equals("TRANSITION"))
{
model.put(MARK_NEXT_STEP_TITLE, request.getParameter(MARK_NEXT_STEP_TITLE));
}

model.put( FormsConstants.MARK_QUESTION, _question );
Expand Down