Skip to content

LUT-29260 : ERR_CACHE_MISS error when canceling in a pop-in #543

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 1 commit into
base: develop
Choose a base branch
from
Open

LUT-29260 : ERR_CACHE_MISS error when canceling in a pop-in #543

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 5 additions & 5 deletions src/java/fr/paris/lutece/portal/web/admin/AdminPageJspBean.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -361,21 +361,21 @@ public String getRemovePage( HttpServletRequest request )
String strPageId = request.getParameter( Parameters.PAGE_ID );
if ( !StringUtils.isNumeric( strPageId ) )
{
return AdminMessageService.getMessageUrl( request, MESSAGE_INVALID_PAGE_ID, AdminMessage.TYPE_ERROR );
return AdminMessageService.getMessageUrl( request, MESSAGE_INVALID_PAGE_ID, JSP_PATH+JSP_ADMIN_SITE, AdminMessage.TYPE_ERROR );
}
int nPageId = Integer.parseInt( strPageId );
Page page = PageHome.getPage( nPageId );
if ( page == null || page.getId( ) == 0 || page.getId( ) != nPageId )
{
return AdminMessageService.getMessageUrl( request, MESSAGE_INVALID_PAGE_ID, AdminMessage.TYPE_ERROR );
return AdminMessageService.getMessageUrl( request, MESSAGE_INVALID_PAGE_ID, JSP_PATH+JSP_ADMIN_SITE, AdminMessage.TYPE_ERROR );
}
Map<String, Object> parameters = new HashMap<>( );
parameters.put( Parameters.PAGE_ID, strPageId );
parameters.put( SecurityTokenService.PARAMETER_TOKEN, SecurityTokenService.getInstance( ).getToken( request, JSP_REMOVE_PAGE ) );

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

/**
Expand All @@ -392,13 +392,13 @@ public String doRemovePage( HttpServletRequest request ) throws AccessDeniedExce
String strPageId = request.getParameter( Parameters.PAGE_ID );
if ( !StringUtils.isNumeric( strPageId ) )
{
return AdminMessageService.getMessageUrl( request, MESSAGE_INVALID_PAGE_ID, AdminMessage.TYPE_ERROR );
return AdminMessageService.getMessageUrl( request, MESSAGE_INVALID_PAGE_ID, JSP_PATH+JSP_ADMIN_SITE, AdminMessage.TYPE_ERROR );
}
int nPageId = Integer.parseInt( strPageId );
Page page = PageHome.getPage( nPageId );
if ( page == null || page.getId( ) == 0 || page.getId( ) != nPageId )
{
return AdminMessageService.getMessageUrl( request, MESSAGE_INVALID_PAGE_ID, AdminMessage.TYPE_ERROR );
return AdminMessageService.getMessageUrl( request, MESSAGE_INVALID_PAGE_ID, JSP_PATH+JSP_ADMIN_SITE, AdminMessage.TYPE_ERROR );
}
// Checks that the page has no child
Collection<Page> list = PageHome.getChildPagesMinimalData( nPageId );
Expand Down
15 changes: 8 additions & 7 deletions src/java/fr/paris/lutece/portal/web/admin/AdminPagePortletJspBean.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,7 @@ public class AdminPagePortletJspBean extends AdminFeaturesPageJspBean
private static final String JSP_DO_MODIFY_POSITION = "jsp/admin/site/DoModifyPortletPosition.jsp";
private static final String JSP_DO_MODIFY_STATUS = "jsp/admin/site/DoModifyPortletStatus.jsp";
private static final String JSP_ADMIN_SITE = "AdminSite.jsp";
private static final String JSP_PATH = "jsp/admin/site/";

/**
* Processes the modification of a portlet whose identifier is stored in the http request
Expand Down Expand Up @@ -217,7 +218,7 @@ public String doRemovePortlet( HttpServletRequest request ) throws AccessDeniedE
String strPortletId = request.getParameter( Parameters.PORTLET_ID );
if ( !StringUtils.isNumeric( strPortletId ) )
{
return AdminMessageService.getMessageUrl( request, Messages.MANDATORY_FIELDS, AdminMessage.TYPE_ERROR );
return AdminMessageService.getMessageUrl( request, Messages.MANDATORY_FIELDS, JSP_PATH+JSP_ADMIN_SITE, AdminMessage.TYPE_ERROR );
}
int nPortletId = Integer.parseInt( strPortletId );
Portlet portlet = null;
Expand All @@ -233,7 +234,7 @@ public String doRemovePortlet( HttpServletRequest request ) throws AccessDeniedE
{
return AdminMessageService.getMessageUrl( request, Messages.MESSAGE_INVALID_ENTRY, new Object [ ] {
nPortletId
}, AdminMessage.TYPE_ERROR );
}, JSP_PATH+JSP_ADMIN_SITE, AdminMessage.TYPE_ERROR );
}
if ( !SecurityTokenService.getInstance( ).validate( request, JSP_REMOVE_PORTLET ) )
{
Expand Down Expand Up @@ -330,7 +331,7 @@ public String doModifyPortletStatus( HttpServletRequest request ) throws AccessD
String strStatus = request.getParameter( PORTLET_STATUS );
if ( !StringUtils.isNumeric( strPortletId ) || !StringUtils.isNumeric( strStatus ) )
{
return AdminMessageService.getMessageUrl( request, Messages.MANDATORY_FIELDS, AdminMessage.TYPE_ERROR );
return AdminMessageService.getMessageUrl( request, Messages.MANDATORY_FIELDS, JSP_PATH+JSP_ADMIN_SITE, AdminMessage.TYPE_ERROR );
}
int nPortletId = Integer.parseInt( strPortletId );
Portlet portlet = null;
Expand All @@ -346,14 +347,14 @@ public String doModifyPortletStatus( HttpServletRequest request ) throws AccessD
{
return AdminMessageService.getMessageUrl( request, Messages.MESSAGE_INVALID_ENTRY, new Object [ ] {
nPortletId
}, AdminMessage.TYPE_ERROR );
}, JSP_PATH+JSP_ADMIN_SITE, AdminMessage.TYPE_ERROR );
}
int nStatus = Integer.parseInt( strStatus );
if ( nStatus != Portlet.STATUS_PUBLISHED && nStatus != Portlet.STATUS_UNPUBLISHED )
{
return AdminMessageService.getMessageUrl( request, Messages.MESSAGE_INVALID_ENTRY, new Object [ ] {
nStatus
}, AdminMessage.TYPE_ERROR );
}, JSP_PATH+JSP_ADMIN_SITE, AdminMessage.TYPE_ERROR );
}
AdminUser user = AdminUserService.getAdminUser( request );
if ( !RBACService.isAuthorized( PortletType.RESOURCE_TYPE, portlet.getPortletTypeId( ), PortletResourceIdService.PERMISSION_MANAGE, user ) )
Expand Down Expand Up @@ -383,7 +384,7 @@ public String doUpdatePortletPosition( HttpServletRequest request ) throws Acces

if ( !StringUtils.isNumeric( strPortletId ) || !StringUtils.isNumeric( strColumnId ) || !StringUtils.isNumeric( strOrder ) )
{
return AdminMessageService.getMessageUrl( request, Messages.MANDATORY_FIELDS, AdminMessage.TYPE_ERROR );
return AdminMessageService.getMessageUrl( request, Messages.MANDATORY_FIELDS, JSP_PATH+JSP_ADMIN_SITE, AdminMessage.TYPE_ERROR );
}
int nPortletId = Integer.parseInt( strPortletId );
int nColumnId = Integer.parseInt( strColumnId );
Expand All @@ -401,7 +402,7 @@ public String doUpdatePortletPosition( HttpServletRequest request ) throws Acces
{
return AdminMessageService.getMessageUrl( request, Messages.MESSAGE_INVALID_ENTRY, new Object [ ] {
nPortletId
}, AdminMessage.TYPE_ERROR );
}, JSP_PATH+JSP_ADMIN_SITE, AdminMessage.TYPE_ERROR );
}

PortletHome.updatePosition( portlet, nColumnId, nOrder );
Expand Down
6 changes: 3 additions & 3 deletions src/java/fr/paris/lutece/portal/web/mailinglist/MailingListJspBean.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -338,13 +338,13 @@ public String getConfirmRemoveMailingList( HttpServletRequest request )
Object [ ] args = {
strCause
};
return AdminMessageService.getMessageUrl( request, MESSAGE_CANNOT_REMOVE, args, AdminMessage.TYPE_STOP );
return AdminMessageService.getMessageUrl( request, MESSAGE_CANNOT_REMOVE, args, JSP_URL_MANAGE_MAILINGLISTS, AdminMessage.TYPE_STOP );
}
String strUrlRemove = JSP_URL_REMOVE_MAILINGLIST;
Map<String, String> parameters = new HashMap<>( );
Map<String, Object> parameters = new HashMap<>( );
parameters.put( PARAMETER_MAILINGLIST_ID, strId );
parameters.put( SecurityTokenService.PARAMETER_TOKEN, SecurityTokenService.getInstance( ).getToken( request, JSP_URL_REMOVE_MAILINGLIST ) );
return AdminMessageService.getMessageUrl( request, MESSAGE_CONFIRM_REMOVE, strUrlRemove, AdminMessage.TYPE_CONFIRMATION, parameters );
return AdminMessageService.getMessageUrl( request, MESSAGE_CONFIRM_REMOVE, null, null, strUrlRemove, null, AdminMessage.TYPE_CONFIRMATION, parameters, JSP_URL_MANAGE_MAILINGLISTS );

}

Expand Down
9 changes: 6 additions & 3 deletions src/java/fr/paris/lutece/portal/web/portlet/AliasPortletJspBean.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,9 @@ public class AliasPortletJspBean extends PortletJspBean
private static final String MARK_ALIAS_PORTLETS_LIST = "alias_portlets_list";
private static final String MARK_ALIAS_PORTLET = "alias_portlet";
private static final String LABEL_ALIAS_PORTLET_NAME = "portal.site.portlet_alias.portlet.name.label";

private static final String JSP_ADMIN_SITE = "AdminSite.jsp";
private static final String JSP_PATH = "jsp/admin/site/";

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

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

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

portlet.setName( strName );
Expand Down
9 changes: 5 additions & 4 deletions src/java/fr/paris/lutece/portal/web/portlet/PortletJspBean.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,7 @@ public abstract class PortletJspBean extends AdminFeaturesPageJspBean

// Jsp
private static final String JSP_ADMIN_SITE = "../../site/AdminSite.jsp";
private static final String JSP_ADMIN_SITE_WITH_PATH = "jsp/admin/site/AdminSite.jsp";

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

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

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

if ( !PageHome.checkPageExist( nPageId ) )
{
return AdminMessageService.getMessageUrl( request, MESSAGE_INVALID_PAGE_ID, AdminMessage.TYPE_STOP );
return AdminMessageService.getMessageUrl( request, MESSAGE_INVALID_PAGE_ID, JSP_ADMIN_SITE_WITH_PATH, AdminMessage.TYPE_STOP );
}
}
catch( NumberFormatException e )
{
AppLogService.error( e.getMessage( ), e );

return AdminMessageService.getMessageUrl( request, MESSAGE_INVALID_PAGE_ID, AdminMessage.TYPE_STOP );
return AdminMessageService.getMessageUrl( request, MESSAGE_INVALID_PAGE_ID, JSP_ADMIN_SITE_WITH_PATH, AdminMessage.TYPE_STOP );
}

int nOrder = Integer.parseInt( strOrder );
Expand Down
5 changes: 3 additions & 2 deletions src/java/fr/paris/lutece/portal/web/rbac/RoleManagementJspBean.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -179,6 +179,7 @@ public class RoleManagementJspBean extends AdminFeaturesPageJspBean
private static final String JSP_URL_REMOVE_CONTROL_FROM_ROLE = "jsp/admin/rbac/DoRemoveControlFromRole.jsp";
private static final String JSP_ASSIGN_USERS_TO_ROLE = "AssignUsersRole.jsp";
private static final String JSP_URL_ASSIGN_USERS_TO_ROLE = "jsp/admin/rbac/AssignUsersRole.jsp";
private static final String JSP_PATH = "jsp/admin/rbac/";
private int _nItemsPerPage;
private int _nDefaultItemsPerPage;
private String _strCurrentPageIndex;
Expand Down Expand Up @@ -611,7 +612,7 @@ public String doSelectResources( HttpServletRequest request )

if ( ( strSelectionMethod == null ) || ( strSelectionMethod.trim( ).equals( "" ) ) )
{
return AdminMessageService.getMessageUrl( request, PROPERTY_MESSAGE_NO_ID_SELECTION_METHOD, AdminMessage.TYPE_STOP );
return AdminMessageService.getMessageUrl( request, PROPERTY_MESSAGE_NO_ID_SELECTION_METHOD, JSP_PATH+JSP_URL_ROLES_MANAGEMENT, AdminMessage.TYPE_STOP );
}
else
if ( strSelectionMethod.equals( PARAMETER_SELECTION_METHOD_CHOOSE ) )
Expand All @@ -627,7 +628,7 @@ public String doSelectResources( HttpServletRequest request )
}
else
{
return AdminMessageService.getMessageUrl( request, PROPERTY_MESSAGE_NO_ID_SELECTION_METHOD, AdminMessage.TYPE_STOP );
return AdminMessageService.getMessageUrl( request, PROPERTY_MESSAGE_NO_ID_SELECTION_METHOD, JSP_PATH+JSP_URL_ROLES_MANAGEMENT, AdminMessage.TYPE_STOP );
}
}

Expand Down
9 changes: 5 additions & 4 deletions src/java/fr/paris/lutece/portal/web/style/StylesJspBean.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,7 @@ public class StylesJspBean extends AdminFeaturesPageJspBean
// Jsp Definition
private static final String JSP_DO_REMOVE_STYLE = "jsp/admin/style/DoRemoveStyle.jsp";
private static final String JSP_DO_REMOVE_STYLESHEET = "jsp/admin/style/DoRemoveStyleSheet.jsp";
private static final String JSP_MANAGE_STYLESHEETS = "jsp/admin/style/ManageStyles.jsp";

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

if ( CollectionUtils.isNotEmpty( listPortlets ) )
{
return AdminMessageService.getMessageUrl( request, MESSAGE_CANT_DELETE_STYLE_PORTLETS, AdminMessage.TYPE_STOP );
return AdminMessageService.getMessageUrl( request, MESSAGE_CANT_DELETE_STYLE_PORTLETS, JSP_MANAGE_STYLESHEETS, AdminMessage.TYPE_STOP );
}

if ( CollectionUtils.isNotEmpty( listStyleSheets ) )
Expand All @@ -351,15 +352,15 @@ public String getConfirmRemoveStyle( HttpServletRequest request )
parameters.put( Parameters.STYLE_ID, Integer.toString( styleSheet.getStyleId( ) ) );
parameters.put( SecurityTokenService.PARAMETER_TOKEN, SecurityTokenService.getInstance( ).getToken( request, JSP_DO_REMOVE_STYLESHEET ) );
return AdminMessageService.getMessageUrl( request, MESSAGE_CONFIRM_DELETE_STYLESHEET, args, null, JSP_DO_REMOVE_STYLESHEET, null,
AdminMessage.TYPE_CONFIRMATION, parameters );
AdminMessage.TYPE_CONFIRMATION, parameters, JSP_MANAGE_STYLESHEETS );
}
}

Map<String, String> parameters = new HashMap<>( );
Map<String, Object> parameters = new HashMap<>( );
parameters.put( Parameters.STYLE_ID, Integer.toString( nId ) );
parameters.put( SecurityTokenService.PARAMETER_TOKEN, SecurityTokenService.getInstance( ).getToken( request, JSP_DO_REMOVE_STYLE ) );

return AdminMessageService.getMessageUrl( request, MESSAGE_CONFIRM_DELETE_STYLE, JSP_DO_REMOVE_STYLE, AdminMessage.TYPE_CONFIRMATION, parameters );
return AdminMessageService.getMessageUrl( request, MESSAGE_CONFIRM_DELETE_STYLE, null, null, JSP_DO_REMOVE_STYLE, null, AdminMessage.TYPE_CONFIRMATION, parameters, JSP_MANAGE_STYLESHEETS );
}

/**
Expand Down
3 changes: 2 additions & 1 deletion src/java/fr/paris/lutece/portal/web/system/CacheJspBean.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,7 @@ public class CacheJspBean extends AdminFeaturesPageJspBean

// Jsp definition
public static final String JSP_MANAGE_CACHES = "ManageCaches.jsp";
private static final String JSP_PATH = "jsp/admin/system/";

private static final String JSP_TOGGLE_CACHE = "jsp/admin/system/DoToggleCache.jsp";
private static final String PROPERTY_MESSAGE_CONFIRM_TOOGLE_CACHE = "portal.system.message.confirmToggleCache";
Expand Down Expand Up @@ -208,7 +209,7 @@ public String getConfirmToggleCache( HttpServletRequest request )
PROPERTY_MESSAGE_CONFIRM_TOOGLE_CACHE_TITLE, JSP_TOGGLE_CACHE, "", AdminMessage.TYPE_CONFIRMATION, parameters );
}
}
return AdminMessageService.getMessageUrl( request, PROPERTY_MESSAGE_INVALID_CACHE_ID, JSP_MANAGE_CACHES, AdminMessage.TYPE_ERROR );
return AdminMessageService.getMessageUrl( request, PROPERTY_MESSAGE_INVALID_CACHE_ID, JSP_PATH+JSP_MANAGE_CACHES, AdminMessage.TYPE_ERROR );
}

/**
Expand Down
Loading