Skip to content

Commit 5980936

Browse files
jlf-evidenseboo
jlf-eviden
authored and
seboo
committed
LUT-29260 : ERR_CACHE_MISS error when canceling in a pop-in
1 parent 9bce57a commit 5980936

File tree

14 files changed

+68
-54
lines changed

14 files changed

+68
-54
lines changed

‎src/java/fr/paris/lutece/portal/web/admin/AdminPageJspBean.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -361,21 +361,21 @@ public String getRemovePage( HttpServletRequest request )
361361
String strPageId = request.getParameter( Parameters.PAGE_ID );
362362
if ( !StringUtils.isNumeric( strPageId ) )
363363
{
364-
return AdminMessageService.getMessageUrl( request, MESSAGE_INVALID_PAGE_ID, AdminMessage.TYPE_ERROR );
364+
return AdminMessageService.getMessageUrl( request, MESSAGE_INVALID_PAGE_ID, JSP_PATH+JSP_ADMIN_SITE, AdminMessage.TYPE_ERROR );
365365
}
366366
int nPageId = Integer.parseInt( strPageId );
367367
Page page = PageHome.getPage( nPageId );
368368
if ( page == null || page.getId( ) == 0 || page.getId( ) != nPageId )
369369
{
370-
return AdminMessageService.getMessageUrl( request, MESSAGE_INVALID_PAGE_ID, AdminMessage.TYPE_ERROR );
370+
return AdminMessageService.getMessageUrl( request, MESSAGE_INVALID_PAGE_ID, JSP_PATH+JSP_ADMIN_SITE, AdminMessage.TYPE_ERROR );
371371
}
372372
Map<String, Object> parameters = new HashMap<>( );
373373
parameters.put( Parameters.PAGE_ID, strPageId );
374374
parameters.put( SecurityTokenService.PARAMETER_TOKEN, SecurityTokenService.getInstance( ).getToken( request, JSP_REMOVE_PAGE ) );
375375

376376
return AdminMessageService.getMessageUrl( request, PROPERTY_MESSAGE_CONFIRM_REMOVE_PAGE, new Object [ ] {
377377
page.getName( )
378-
}, null, JSP_REMOVE_PAGE, null, AdminMessage.TYPE_CONFIRMATION, parameters );
378+
}, null, JSP_REMOVE_PAGE, null, AdminMessage.TYPE_CONFIRMATION, parameters, JSP_PATH+JSP_ADMIN_SITE );
379379
}
380380

381381
/**
@@ -392,13 +392,13 @@ public String doRemovePage( HttpServletRequest request ) throws AccessDeniedExce
392392
String strPageId = request.getParameter( Parameters.PAGE_ID );
393393
if ( !StringUtils.isNumeric( strPageId ) )
394394
{
395-
return AdminMessageService.getMessageUrl( request, MESSAGE_INVALID_PAGE_ID, AdminMessage.TYPE_ERROR );
395+
return AdminMessageService.getMessageUrl( request, MESSAGE_INVALID_PAGE_ID, JSP_PATH+JSP_ADMIN_SITE, AdminMessage.TYPE_ERROR );
396396
}
397397
int nPageId = Integer.parseInt( strPageId );
398398
Page page = PageHome.getPage( nPageId );
399399
if ( page == null || page.getId( ) == 0 || page.getId( ) != nPageId )
400400
{
401-
return AdminMessageService.getMessageUrl( request, MESSAGE_INVALID_PAGE_ID, AdminMessage.TYPE_ERROR );
401+
return AdminMessageService.getMessageUrl( request, MESSAGE_INVALID_PAGE_ID, JSP_PATH+JSP_ADMIN_SITE, AdminMessage.TYPE_ERROR );
402402
}
403403
// Checks that the page has no child
404404
Collection<Page> list = PageHome.getChildPagesMinimalData( nPageId );

‎src/java/fr/paris/lutece/portal/web/admin/AdminPagePortletJspBean.java‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,7 @@ public class AdminPagePortletJspBean extends AdminFeaturesPageJspBean
7979
private static final String JSP_DO_MODIFY_POSITION = "jsp/admin/site/DoModifyPortletPosition.jsp";
8080
private static final String JSP_DO_MODIFY_STATUS = "jsp/admin/site/DoModifyPortletStatus.jsp";
8181
private static final String JSP_ADMIN_SITE = "AdminSite.jsp";
82+
private static final String JSP_PATH = "jsp/admin/site/";
8283

8384
/**
8485
* Processes the modification of a portlet whose identifier is stored in the http request
@@ -217,7 +218,7 @@ public String doRemovePortlet( HttpServletRequest request ) throws AccessDeniedE
217218
String strPortletId = request.getParameter( Parameters.PORTLET_ID );
218219
if ( !StringUtils.isNumeric( strPortletId ) )
219220
{
220-
return AdminMessageService.getMessageUrl( request, Messages.MANDATORY_FIELDS, AdminMessage.TYPE_ERROR );
221+
return AdminMessageService.getMessageUrl( request, Messages.MANDATORY_FIELDS, JSP_PATH+JSP_ADMIN_SITE, AdminMessage.TYPE_ERROR );
221222
}
222223
int nPortletId = Integer.parseInt( strPortletId );
223224
Portlet portlet = null;
@@ -233,7 +234,7 @@ public String doRemovePortlet( HttpServletRequest request ) throws AccessDeniedE
233234
{
234235
return AdminMessageService.getMessageUrl( request, Messages.MESSAGE_INVALID_ENTRY, new Object [ ] {
235236
nPortletId
236-
}, AdminMessage.TYPE_ERROR );
237+
}, JSP_PATH+JSP_ADMIN_SITE, AdminMessage.TYPE_ERROR );
237238
}
238239
if ( !SecurityTokenService.getInstance( ).validate( request, JSP_REMOVE_PORTLET ) )
239240
{
@@ -330,7 +331,7 @@ public String doModifyPortletStatus( HttpServletRequest request ) throws AccessD
330331
String strStatus = request.getParameter( PORTLET_STATUS );
331332
if ( !StringUtils.isNumeric( strPortletId ) || !StringUtils.isNumeric( strStatus ) )
332333
{
333-
return AdminMessageService.getMessageUrl( request, Messages.MANDATORY_FIELDS, AdminMessage.TYPE_ERROR );
334+
return AdminMessageService.getMessageUrl( request, Messages.MANDATORY_FIELDS, JSP_PATH+JSP_ADMIN_SITE, AdminMessage.TYPE_ERROR );
334335
}
335336
int nPortletId = Integer.parseInt( strPortletId );
336337
Portlet portlet = null;
@@ -346,14 +347,14 @@ public String doModifyPortletStatus( HttpServletRequest request ) throws AccessD
346347
{
347348
return AdminMessageService.getMessageUrl( request, Messages.MESSAGE_INVALID_ENTRY, new Object [ ] {
348349
nPortletId
349-
}, AdminMessage.TYPE_ERROR );
350+
}, JSP_PATH+JSP_ADMIN_SITE, AdminMessage.TYPE_ERROR );
350351
}
351352
int nStatus = Integer.parseInt( strStatus );
352353
if ( nStatus != Portlet.STATUS_PUBLISHED && nStatus != Portlet.STATUS_UNPUBLISHED )
353354
{
354355
return AdminMessageService.getMessageUrl( request, Messages.MESSAGE_INVALID_ENTRY, new Object [ ] {
355356
nStatus
356-
}, AdminMessage.TYPE_ERROR );
357+
}, JSP_PATH+JSP_ADMIN_SITE, AdminMessage.TYPE_ERROR );
357358
}
358359
AdminUser user = AdminUserService.getAdminUser( request );
359360
if ( !RBACService.isAuthorized( PortletType.RESOURCE_TYPE, portlet.getPortletTypeId( ), PortletResourceIdService.PERMISSION_MANAGE, user ) )
@@ -383,7 +384,7 @@ public String doUpdatePortletPosition( HttpServletRequest request ) throws Acces
383384

384385
if ( !StringUtils.isNumeric( strPortletId ) || !StringUtils.isNumeric( strColumnId ) || !StringUtils.isNumeric( strOrder ) )
385386
{
386-
return AdminMessageService.getMessageUrl( request, Messages.MANDATORY_FIELDS, AdminMessage.TYPE_ERROR );
387+
return AdminMessageService.getMessageUrl( request, Messages.MANDATORY_FIELDS, JSP_PATH+JSP_ADMIN_SITE, AdminMessage.TYPE_ERROR );
387388
}
388389
int nPortletId = Integer.parseInt( strPortletId );
389390
int nColumnId = Integer.parseInt( strColumnId );
@@ -401,7 +402,7 @@ public String doUpdatePortletPosition( HttpServletRequest request ) throws Acces
401402
{
402403
return AdminMessageService.getMessageUrl( request, Messages.MESSAGE_INVALID_ENTRY, new Object [ ] {
403404
nPortletId
404-
}, AdminMessage.TYPE_ERROR );
405+
}, JSP_PATH+JSP_ADMIN_SITE, AdminMessage.TYPE_ERROR );
405406
}
406407

407408
PortletHome.updatePosition( portlet, nColumnId, nOrder );

‎src/java/fr/paris/lutece/portal/web/mailinglist/MailingListJspBean.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -338,13 +338,13 @@ public String getConfirmRemoveMailingList( HttpServletRequest request )
338338
Object [ ] args = {
339339
strCause
340340
};
341-
return AdminMessageService.getMessageUrl( request, MESSAGE_CANNOT_REMOVE, args, AdminMessage.TYPE_STOP );
341+
return AdminMessageService.getMessageUrl( request, MESSAGE_CANNOT_REMOVE, args, JSP_URL_MANAGE_MAILINGLISTS, AdminMessage.TYPE_STOP );
342342
}
343343
String strUrlRemove = JSP_URL_REMOVE_MAILINGLIST;
344-
Map<String, String> parameters = new HashMap<>( );
344+
Map<String, Object> parameters = new HashMap<>( );
345345
parameters.put( PARAMETER_MAILINGLIST_ID, strId );
346346
parameters.put( SecurityTokenService.PARAMETER_TOKEN, SecurityTokenService.getInstance( ).getToken( request, JSP_URL_REMOVE_MAILINGLIST ) );
347-
return AdminMessageService.getMessageUrl( request, MESSAGE_CONFIRM_REMOVE, strUrlRemove, AdminMessage.TYPE_CONFIRMATION, parameters );
347+
return AdminMessageService.getMessageUrl( request, MESSAGE_CONFIRM_REMOVE, null, null, strUrlRemove, null, AdminMessage.TYPE_CONFIRMATION, parameters, JSP_URL_MANAGE_MAILINGLISTS );
348348

349349
}
350350

‎src/java/fr/paris/lutece/portal/web/portlet/AliasPortletJspBean.java‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,9 @@ public class AliasPortletJspBean extends PortletJspBean
6868
private static final String MARK_ALIAS_PORTLETS_LIST = "alias_portlets_list";
6969
private static final String MARK_ALIAS_PORTLET = "alias_portlet";
7070
private static final String LABEL_ALIAS_PORTLET_NAME = "portal.site.portlet_alias.portlet.name.label";
71+
72+
private static final String JSP_ADMIN_SITE = "AdminSite.jsp";
73+
private static final String JSP_PATH = "jsp/admin/site/";
7174

7275
/**
7376
* Process portlet's creation
@@ -85,7 +88,7 @@ public String doCreate( HttpServletRequest request )
8588
// if no portlet has the accept alias field true
8689
if ( strAliasId == null )
8790
{
88-
return AdminMessageService.getMessageUrl( request, Messages.MANDATORY_FIELDS, AdminMessage.TYPE_STOP );
91+
return AdminMessageService.getMessageUrl( request, Messages.MANDATORY_FIELDS, JSP_PATH+JSP_ADMIN_SITE, AdminMessage.TYPE_STOP );
8992
}
9093

9194
// Gets the parameters of the alias portlet posted in the request
@@ -94,7 +97,7 @@ public String doCreate( HttpServletRequest request )
9497
// mandatory field
9598
if ( ( strName == null ) || strName.trim( ).equals( "" ) )
9699
{
97-
return AdminMessageService.getMessageUrl( request, Messages.MANDATORY_FIELDS, AdminMessage.TYPE_STOP );
100+
return AdminMessageService.getMessageUrl( request, Messages.MANDATORY_FIELDS, JSP_PATH+JSP_ADMIN_SITE, AdminMessage.TYPE_STOP );
98101
}
99102

100103
String strOrder = request.getParameter( PARAM_ORDER );
@@ -150,7 +153,7 @@ public String doModify( HttpServletRequest request )
150153
// mandatory field
151154
if ( ( strName == null ) || strName.trim( ).equals( "" ) )
152155
{
153-
return AdminMessageService.getMessageUrl( request, Messages.MANDATORY_FIELDS, AdminMessage.TYPE_STOP );
156+
return AdminMessageService.getMessageUrl( request, Messages.MANDATORY_FIELDS, JSP_PATH+JSP_ADMIN_SITE, AdminMessage.TYPE_STOP );
154157
}
155158

156159
portlet.setName( strName );

‎src/java/fr/paris/lutece/portal/web/portlet/PortletJspBean.java‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -101,6 +101,7 @@ public abstract class PortletJspBean extends AdminFeaturesPageJspBean
101101

102102
// Jsp
103103
private static final String JSP_ADMIN_SITE = "../../site/AdminSite.jsp";
104+
private static final String JSP_ADMIN_SITE_WITH_PATH = "jsp/admin/site/AdminSite.jsp";
104105

105106
/**
106107
* Displays the portlet's creation form
@@ -210,13 +211,13 @@ protected String setPortletCommonData( HttpServletRequest request, Portlet portl
210211
// Check Mandatory fields
211212
if ( StringUtil.isAnyEmpty( strName, strOrder, strColumn, strAcceptAlias, strAcceptPortletTitle ) )
212213
{
213-
return AdminMessageService.getMessageUrl( request, Messages.MANDATORY_FIELDS, AdminMessage.TYPE_STOP );
214+
return AdminMessageService.getMessageUrl( request, Messages.MANDATORY_FIELDS, JSP_ADMIN_SITE_WITH_PATH, AdminMessage.TYPE_STOP );
214215
}
215216

216217
// style id is not mandatory if the content is not generated from XML and XSL
217218
if ( portlet.isContentGeneratedByXmlAndXsl( ) && ( strStyleId == null || strStyleId.trim( ).equals( "" ) ) )
218219
{
219-
return AdminMessageService.getMessageUrl( request, Messages.MANDATORY_FIELDS, AdminMessage.TYPE_STOP );
220+
return AdminMessageService.getMessageUrl( request, Messages.MANDATORY_FIELDS, JSP_ADMIN_SITE_WITH_PATH, AdminMessage.TYPE_STOP );
220221
}
221222

222223
String strPageId = request.getParameter( PARAMETER_PAGE_ID );
@@ -229,14 +230,14 @@ protected String setPortletCommonData( HttpServletRequest request, Portlet portl
229230

230231
if ( !PageHome.checkPageExist( nPageId ) )
231232
{
232-
return AdminMessageService.getMessageUrl( request, MESSAGE_INVALID_PAGE_ID, AdminMessage.TYPE_STOP );
233+
return AdminMessageService.getMessageUrl( request, MESSAGE_INVALID_PAGE_ID, JSP_ADMIN_SITE_WITH_PATH, AdminMessage.TYPE_STOP );
233234
}
234235
}
235236
catch( NumberFormatException e )
236237
{
237238
AppLogService.error( e.getMessage( ), e );
238239

239-
return AdminMessageService.getMessageUrl( request, MESSAGE_INVALID_PAGE_ID, AdminMessage.TYPE_STOP );
240+
return AdminMessageService.getMessageUrl( request, MESSAGE_INVALID_PAGE_ID, JSP_ADMIN_SITE_WITH_PATH, AdminMessage.TYPE_STOP );
240241
}
241242

242243
int nOrder = Integer.parseInt( strOrder );

‎src/java/fr/paris/lutece/portal/web/rbac/RoleManagementJspBean.java‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -179,6 +179,7 @@ public class RoleManagementJspBean extends AdminFeaturesPageJspBean
179179
private static final String JSP_URL_REMOVE_CONTROL_FROM_ROLE = "jsp/admin/rbac/DoRemoveControlFromRole.jsp";
180180
private static final String JSP_ASSIGN_USERS_TO_ROLE = "AssignUsersRole.jsp";
181181
private static final String JSP_URL_ASSIGN_USERS_TO_ROLE = "jsp/admin/rbac/AssignUsersRole.jsp";
182+
private static final String JSP_PATH = "jsp/admin/rbac/";
182183
private int _nItemsPerPage;
183184
private int _nDefaultItemsPerPage;
184185
private String _strCurrentPageIndex;
@@ -611,7 +612,7 @@ public String doSelectResources( HttpServletRequest request )
611612

612613
if ( ( strSelectionMethod == null ) || ( strSelectionMethod.trim( ).equals( "" ) ) )
613614
{
614-
return AdminMessageService.getMessageUrl( request, PROPERTY_MESSAGE_NO_ID_SELECTION_METHOD, AdminMessage.TYPE_STOP );
615+
return AdminMessageService.getMessageUrl( request, PROPERTY_MESSAGE_NO_ID_SELECTION_METHOD, JSP_PATH+JSP_URL_ROLES_MANAGEMENT, AdminMessage.TYPE_STOP );
615616
}
616617
else
617618
if ( strSelectionMethod.equals( PARAMETER_SELECTION_METHOD_CHOOSE ) )
@@ -627,7 +628,7 @@ public String doSelectResources( HttpServletRequest request )
627628
}
628629
else
629630
{
630-
return AdminMessageService.getMessageUrl( request, PROPERTY_MESSAGE_NO_ID_SELECTION_METHOD, AdminMessage.TYPE_STOP );
631+
return AdminMessageService.getMessageUrl( request, PROPERTY_MESSAGE_NO_ID_SELECTION_METHOD, JSP_PATH+JSP_URL_ROLES_MANAGEMENT, AdminMessage.TYPE_STOP );
631632
}
632633
}
633634

‎src/java/fr/paris/lutece/portal/web/style/StylesJspBean.java‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -104,6 +104,7 @@ public class StylesJspBean extends AdminFeaturesPageJspBean
104104
// Jsp Definition
105105
private static final String JSP_DO_REMOVE_STYLE = "jsp/admin/style/DoRemoveStyle.jsp";
106106
private static final String JSP_DO_REMOVE_STYLESHEET = "jsp/admin/style/DoRemoveStyleSheet.jsp";
107+
private static final String JSP_MANAGE_STYLESHEETS = "jsp/admin/style/ManageStyles.jsp";
107108

108109
// Message keys
109110
private static final String MESSAGE_CANT_DELETE_STYLE_PORTLETS = "portal.style.message.cannotDeleteStylePorlets";
@@ -335,7 +336,7 @@ public String getConfirmRemoveStyle( HttpServletRequest request )
335336

336337
if ( CollectionUtils.isNotEmpty( listPortlets ) )
337338
{
338-
return AdminMessageService.getMessageUrl( request, MESSAGE_CANT_DELETE_STYLE_PORTLETS, AdminMessage.TYPE_STOP );
339+
return AdminMessageService.getMessageUrl( request, MESSAGE_CANT_DELETE_STYLE_PORTLETS, JSP_MANAGE_STYLESHEETS, AdminMessage.TYPE_STOP );
339340
}
340341

341342
if ( CollectionUtils.isNotEmpty( listStyleSheets ) )
@@ -351,15 +352,15 @@ public String getConfirmRemoveStyle( HttpServletRequest request )
351352
parameters.put( Parameters.STYLE_ID, Integer.toString( styleSheet.getStyleId( ) ) );
352353
parameters.put( SecurityTokenService.PARAMETER_TOKEN, SecurityTokenService.getInstance( ).getToken( request, JSP_DO_REMOVE_STYLESHEET ) );
353354
return AdminMessageService.getMessageUrl( request, MESSAGE_CONFIRM_DELETE_STYLESHEET, args, null, JSP_DO_REMOVE_STYLESHEET, null,
354-
AdminMessage.TYPE_CONFIRMATION, parameters );
355+
AdminMessage.TYPE_CONFIRMATION, parameters, JSP_MANAGE_STYLESHEETS );
355356
}
356357
}
357358

358-
Map<String, String> parameters = new HashMap<>( );
359+
Map<String, Object> parameters = new HashMap<>( );
359360
parameters.put( Parameters.STYLE_ID, Integer.toString( nId ) );
360361
parameters.put( SecurityTokenService.PARAMETER_TOKEN, SecurityTokenService.getInstance( ).getToken( request, JSP_DO_REMOVE_STYLE ) );
361362

362-
return AdminMessageService.getMessageUrl( request, MESSAGE_CONFIRM_DELETE_STYLE, JSP_DO_REMOVE_STYLE, AdminMessage.TYPE_CONFIRMATION, parameters );
363+
return AdminMessageService.getMessageUrl( request, MESSAGE_CONFIRM_DELETE_STYLE, null, null, JSP_DO_REMOVE_STYLE, null, AdminMessage.TYPE_CONFIRMATION, parameters, JSP_MANAGE_STYLESHEETS );
363364
}
364365

365366
/**

‎src/java/fr/paris/lutece/portal/web/system/CacheJspBean.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,7 @@ public class CacheJspBean extends AdminFeaturesPageJspBean
6363

6464
// Jsp definition
6565
public static final String JSP_MANAGE_CACHES = "ManageCaches.jsp";
66+
private static final String JSP_PATH = "jsp/admin/system/";
6667

6768
private static final String JSP_TOGGLE_CACHE = "jsp/admin/system/DoToggleCache.jsp";
6869
private static final String PROPERTY_MESSAGE_CONFIRM_TOOGLE_CACHE = "portal.system.message.confirmToggleCache";
@@ -208,7 +209,7 @@ public String getConfirmToggleCache( HttpServletRequest request )
208209
PROPERTY_MESSAGE_CONFIRM_TOOGLE_CACHE_TITLE, JSP_TOGGLE_CACHE, "", AdminMessage.TYPE_CONFIRMATION, parameters );
209210
}
210211
}
211-
return AdminMessageService.getMessageUrl( request, PROPERTY_MESSAGE_INVALID_CACHE_ID, JSP_MANAGE_CACHES, AdminMessage.TYPE_ERROR );
212+
return AdminMessageService.getMessageUrl( request, PROPERTY_MESSAGE_INVALID_CACHE_ID, JSP_PATH+JSP_MANAGE_CACHES, AdminMessage.TYPE_ERROR );
212213
}
213214

214215
/**

0 commit comments

Comments
 (0)