diff --git a/src/java/fr/paris/lutece/portal/web/admin/AdminPageJspBean.java b/src/java/fr/paris/lutece/portal/web/admin/AdminPageJspBean.java index 924e48f7c0..89aea66735 100644 --- a/src/java/fr/paris/lutece/portal/web/admin/AdminPageJspBean.java +++ b/src/java/fr/paris/lutece/portal/web/admin/AdminPageJspBean.java @@ -361,13 +361,13 @@ 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 parameters = new HashMap<>( ); parameters.put( Parameters.PAGE_ID, strPageId ); @@ -375,7 +375,7 @@ public String getRemovePage( HttpServletRequest request ) 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 ); } /** @@ -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 list = PageHome.getChildPagesMinimalData( nPageId ); diff --git a/src/java/fr/paris/lutece/portal/web/admin/AdminPagePortletJspBean.java b/src/java/fr/paris/lutece/portal/web/admin/AdminPagePortletJspBean.java index d65fa6ee66..d1dac00058 100644 --- a/src/java/fr/paris/lutece/portal/web/admin/AdminPagePortletJspBean.java +++ b/src/java/fr/paris/lutece/portal/web/admin/AdminPagePortletJspBean.java @@ -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 @@ -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; @@ -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 ) ) { @@ -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; @@ -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 ) ) @@ -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 ); @@ -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 ); diff --git a/src/java/fr/paris/lutece/portal/web/mailinglist/MailingListJspBean.java b/src/java/fr/paris/lutece/portal/web/mailinglist/MailingListJspBean.java index a319be805c..0399067327 100644 --- a/src/java/fr/paris/lutece/portal/web/mailinglist/MailingListJspBean.java +++ b/src/java/fr/paris/lutece/portal/web/mailinglist/MailingListJspBean.java @@ -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 parameters = new HashMap<>( ); + Map 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 ); } diff --git a/src/java/fr/paris/lutece/portal/web/portlet/AliasPortletJspBean.java b/src/java/fr/paris/lutece/portal/web/portlet/AliasPortletJspBean.java index 75c64fbe9a..a3e31737ec 100644 --- a/src/java/fr/paris/lutece/portal/web/portlet/AliasPortletJspBean.java +++ b/src/java/fr/paris/lutece/portal/web/portlet/AliasPortletJspBean.java @@ -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 @@ -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 @@ -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 ); @@ -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 ); diff --git a/src/java/fr/paris/lutece/portal/web/portlet/PortletJspBean.java b/src/java/fr/paris/lutece/portal/web/portlet/PortletJspBean.java index 3b65b79d9f..c9b1df3c76 100644 --- a/src/java/fr/paris/lutece/portal/web/portlet/PortletJspBean.java +++ b/src/java/fr/paris/lutece/portal/web/portlet/PortletJspBean.java @@ -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 @@ -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 ); @@ -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 ); diff --git a/src/java/fr/paris/lutece/portal/web/rbac/RoleManagementJspBean.java b/src/java/fr/paris/lutece/portal/web/rbac/RoleManagementJspBean.java index db26d13b40..b1ed39d2cd 100644 --- a/src/java/fr/paris/lutece/portal/web/rbac/RoleManagementJspBean.java +++ b/src/java/fr/paris/lutece/portal/web/rbac/RoleManagementJspBean.java @@ -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; @@ -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 ) ) @@ -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 ); } } diff --git a/src/java/fr/paris/lutece/portal/web/style/StylesJspBean.java b/src/java/fr/paris/lutece/portal/web/style/StylesJspBean.java index 96afed666b..7ecd32f942 100644 --- a/src/java/fr/paris/lutece/portal/web/style/StylesJspBean.java +++ b/src/java/fr/paris/lutece/portal/web/style/StylesJspBean.java @@ -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"; @@ -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 ) ) @@ -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 parameters = new HashMap<>( ); + Map 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 ); } /** diff --git a/src/java/fr/paris/lutece/portal/web/system/CacheJspBean.java b/src/java/fr/paris/lutece/portal/web/system/CacheJspBean.java index 2e34869f34..cc34e64fca 100644 --- a/src/java/fr/paris/lutece/portal/web/system/CacheJspBean.java +++ b/src/java/fr/paris/lutece/portal/web/system/CacheJspBean.java @@ -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"; @@ -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 ); } /** diff --git a/src/java/fr/paris/lutece/portal/web/system/PluginJspBean.java b/src/java/fr/paris/lutece/portal/web/system/PluginJspBean.java index 97aa1216f7..c35aeebfee 100644 --- a/src/java/fr/paris/lutece/portal/web/system/PluginJspBean.java +++ b/src/java/fr/paris/lutece/portal/web/system/PluginJspBean.java @@ -96,6 +96,8 @@ public class PluginJspBean extends AdminFeaturesPageJspBean private static final String PROPERTY_PLUGIN_TYPE_NAME_CONTENTSERVICE = "portal.system.pluginType.name.contentService"; private static final String TEMPLATE_PLUGIN_DETAILS = "/admin/system/view_plugin.html"; private static final String JSP_UNINSTALL_PLUGIN = "jsp/admin/system/DoUninstallPlugin.jsp"; + public static final String JSP_MANAGE_PLUGINS = "ManagePlugins.jsp"; + private static final String JSP_PATH = "jsp/admin/system/"; /** * Returns the plugins management page @@ -144,7 +146,7 @@ public String doInstallPlugin( HttpServletRequest request, ServletContext contex plugin.getMinCoreVersion( ), plugin.getMaxCoreVersion( ) }; - return AdminMessageService.getMessageUrl( request, PROPERTY_PLUGIN_NO_CORE_COMPATIBILITY_MESSAGE, args, AdminMessage.TYPE_STOP ); + return AdminMessageService.getMessageUrl( request, PROPERTY_PLUGIN_NO_CORE_COMPATIBILITY_MESSAGE, args, JSP_PATH+JSP_MANAGE_PLUGINS, AdminMessage.TYPE_STOP ); } if ( !SecurityTokenService.getInstance( ).validate( request, TEMPLATE_MANAGE_PLUGINS ) ) @@ -159,7 +161,7 @@ public String doInstallPlugin( HttpServletRequest request, ServletContext contex { AppLogService.error( e.getMessage( ), e ); - return AdminMessageService.getMessageUrl( request, PROPERTY_PLUGIN_INSTALL_ERROR, AdminMessage.TYPE_STOP ); + return AdminMessageService.getMessageUrl( request, PROPERTY_PLUGIN_INSTALL_ERROR, JSP_PATH+JSP_MANAGE_PLUGINS, AdminMessage.TYPE_STOP ); } return getHomeUrl( request ); @@ -209,11 +211,11 @@ public String getConfirmUninstallPlugin( HttpServletRequest request ) Plugin plugin = PluginService.getPlugin( strPluginName ); Collection listPortletTypes = plugin.getPortletTypes( ); String strMessageKey = PROPERTY_PLUGIN_MESSAGE; - Map parameters = new HashMap<>( ); + Map parameters = new HashMap<>( ); parameters.put( PARAM_PLUGIN_NAME, strPluginName ); parameters.put( SecurityTokenService.PARAMETER_TOKEN, SecurityTokenService.getInstance( ).getToken( request, JSP_UNINSTALL_PLUGIN ) ); - String strAdminMessageUrl = AdminMessageService.getMessageUrl( request, strMessageKey, JSP_UNINSTALL_PLUGIN, AdminMessage.TYPE_CONFIRMATION, - parameters ); + String strAdminMessageUrl = AdminMessageService.getMessageUrl( request, strMessageKey, null, null, JSP_UNINSTALL_PLUGIN, null, AdminMessage.TYPE_CONFIRMATION, + parameters, JSP_PATH+JSP_MANAGE_PLUGINS ); for ( PortletType portletType : listPortletTypes ) { @@ -222,7 +224,7 @@ public String getConfirmUninstallPlugin( HttpServletRequest request ) if ( ( plugin.getType( ) & Plugin.PLUGIN_TYPE_PORTLET ) != 0 && isPortletExists( strPluginHomeClass ) ) { strMessageKey = PROPERTY_PLUGIN_PORTLET_EXIST_MESSAGE; - strAdminMessageUrl = AdminMessageService.getMessageUrl( request, strMessageKey, AdminMessage.TYPE_CONFIRMATION ); + strAdminMessageUrl = AdminMessageService.getMessageUrl( request, strMessageKey, JSP_PATH+JSP_MANAGE_PLUGINS, AdminMessage.TYPE_STOP ); } } diff --git a/src/java/fr/paris/lutece/portal/web/user/AdminUserJspBean.java b/src/java/fr/paris/lutece/portal/web/user/AdminUserJspBean.java index a098798c72..f38680232d 100644 --- a/src/java/fr/paris/lutece/portal/web/user/AdminUserJspBean.java +++ b/src/java/fr/paris/lutece/portal/web/user/AdminUserJspBean.java @@ -269,6 +269,7 @@ public class AdminUserJspBean extends AdminFeaturesPageJspBean private static final String JSP_MANAGE_USER_ROLES = "ManageUserRoles.jsp"; private static final String JSP_MANAGE_USER = "ManageUsers.jsp"; private static final String JSP_MANAGE_USER_WORKGROUPS = "ManageUserWorkgroups.jsp"; + private static final String JSP_URL_MANAGE_USERS = "jsp/admin/user/ManageUsers.jsp"; private static final String JSP_URL_REMOVE_USER = "jsp/admin/user/DoRemoveUser.jsp"; private static final String JSP_URL_CREATE_USER = "jsp/admin/user/CreateUser.jsp"; private static final String JSP_URL_IMPORT_USER = "jsp/admin/user/ImportUser.jsp"; @@ -540,13 +541,13 @@ public String doSelectImportUser( HttpServletRequest request ) if ( ( strAccessCode == null ) || ( strAccessCode.equals( "" ) ) ) { - return AdminMessageService.getMessageUrl( request, Messages.MANDATORY_FIELDS, AdminMessage.TYPE_STOP ); + return AdminMessageService.getMessageUrl( request, Messages.MANDATORY_FIELDS, JSP_URL_IMPORT_USER, AdminMessage.TYPE_STOP ); } // check that access code is not in use if ( AdminUserHome.checkAccessCodeAlreadyInUse( strAccessCode ) != -1 ) { - return AdminMessageService.getMessageUrl( request, PROPERTY_MESSAGE_ACCESS_CODE_ALREADY_USED, AdminMessage.TYPE_STOP ); + return AdminMessageService.getMessageUrl( request, PROPERTY_MESSAGE_ACCESS_CODE_ALREADY_USED, JSP_URL_IMPORT_USER, AdminMessage.TYPE_STOP ); } return AppPathService.getBaseUrl( request ) + JSP_URL_CREATE_USER + "?" + PARAMETER_ACCESS_CODE + "=" + strAccessCode; @@ -1424,7 +1425,7 @@ public String doConfirmRemoveAdminUser( HttpServletRequest request ) throws Acce if ( user == null ) { - return AdminMessageService.getMessageUrl( request, PROPERTY_MESSAGE_USER_ERROR_SESSION, AdminMessage.TYPE_ERROR ); + return AdminMessageService.getMessageUrl( request, PROPERTY_MESSAGE_USER_ERROR_SESSION, JSP_URL_MANAGE_USERS, AdminMessage.TYPE_ERROR ); } AdminUser currentUser = AdminUserService.getAdminUser( request ); @@ -1441,7 +1442,7 @@ public String doConfirmRemoveAdminUser( HttpServletRequest request ) throws Acce return AdminMessageService.getMessageUrl( request, PROPERTY_MESSAGE_CONFIRM_REMOVE, new Object [ ] { user.getFirstName( ), user.getLastName( ), user.getAccessCode( ) - }, null, strUrlRemove, null, AdminMessage.TYPE_CONFIRMATION, parameters ); + }, null, strUrlRemove, null, AdminMessage.TYPE_CONFIRMATION, parameters, JSP_URL_MANAGE_USERS ); } /** @@ -1461,7 +1462,7 @@ public String doRemoveAdminUser( HttpServletRequest request ) throws AccessDenie if ( user == null ) { - return AdminMessageService.getMessageUrl( request, PROPERTY_MESSAGE_USER_ERROR_SESSION, AdminMessage.TYPE_ERROR ); + return AdminMessageService.getMessageUrl( request, PROPERTY_MESSAGE_USER_ERROR_SESSION, JSP_URL_MANAGE_USERS, AdminMessage.TYPE_ERROR ); } if ( !SecurityTokenService.getInstance( ).validate( request, JSP_URL_REMOVE_USER ) ) { @@ -2427,7 +2428,7 @@ public String getAnonymizeAdminUser( HttpServletRequest request ) if ( !StringUtils.isNumeric( strAdminUserId ) || strAdminUserId.isEmpty( ) ) { - return AdminMessageService.getMessageUrl( request, PROPERTY_MESSAGE_NO_ADMIN_USER_SELECTED, AdminMessage.TYPE_STOP ); + return AdminMessageService.getMessageUrl( request, PROPERTY_MESSAGE_NO_ADMIN_USER_SELECTED, JSP_URL_MANAGE_USERS, AdminMessage.TYPE_STOP ); } int nUserId = Integer.parseInt( strAdminUserId ); @@ -2435,7 +2436,7 @@ public String getAnonymizeAdminUser( HttpServletRequest request ) if ( user == null ) { - return AdminMessageService.getMessageUrl( request, PROPERTY_MESSAGE_USER_ERROR_SESSION, AdminMessage.TYPE_ERROR ); + return AdminMessageService.getMessageUrl( request, PROPERTY_MESSAGE_USER_ERROR_SESSION, JSP_URL_MANAGE_USERS, AdminMessage.TYPE_ERROR ); } String strUrl = JSP_URL_ANONYMIZE_ADMIN_USER; @@ -2445,7 +2446,7 @@ public String getAnonymizeAdminUser( HttpServletRequest request ) return AdminMessageService.getMessageUrl( request, PROPERTY_MESSAGE_CONFIRM_ANONYMIZE_USER, new Object [ ] { user.getFirstName( ), user.getLastName( ), user.getAccessCode( ) - }, null, strUrl, null, AdminMessage.TYPE_CONFIRMATION, parameters ); + }, null, strUrl, null, AdminMessage.TYPE_CONFIRMATION, parameters, JSP_URL_MANAGE_USERS ); } /** @@ -2463,7 +2464,7 @@ public String doAnonymizeAdminUser( HttpServletRequest request ) throws AccessDe if ( !StringUtils.isNumeric( strAdminUserId ) || strAdminUserId.isEmpty( ) ) { - return AdminMessageService.getMessageUrl( request, PROPERTY_MESSAGE_NO_ADMIN_USER_SELECTED, AdminMessage.TYPE_STOP ); + return AdminMessageService.getMessageUrl( request, PROPERTY_MESSAGE_NO_ADMIN_USER_SELECTED, JSP_URL_MANAGE_USERS, AdminMessage.TYPE_STOP ); } int nUserId = Integer.parseInt( strAdminUserId ); @@ -2471,7 +2472,7 @@ public String doAnonymizeAdminUser( HttpServletRequest request ) throws AccessDe if ( user == null ) { - return AdminMessageService.getMessageUrl( request, PROPERTY_MESSAGE_USER_ERROR_SESSION, AdminMessage.TYPE_ERROR ); + return AdminMessageService.getMessageUrl( request, PROPERTY_MESSAGE_USER_ERROR_SESSION, JSP_URL_MANAGE_USERS, AdminMessage.TYPE_ERROR ); } if ( !SecurityTokenService.getInstance( ).validate( request, JSP_URL_ANONYMIZE_ADMIN_USER ) ) { diff --git a/src/java/fr/paris/lutece/portal/web/user/attribute/AttributeFieldJspBean.java b/src/java/fr/paris/lutece/portal/web/user/attribute/AttributeFieldJspBean.java index a6fcc939fb..ea26b7ea22 100644 --- a/src/java/fr/paris/lutece/portal/web/user/attribute/AttributeFieldJspBean.java +++ b/src/java/fr/paris/lutece/portal/web/user/attribute/AttributeFieldJspBean.java @@ -97,6 +97,7 @@ public class AttributeFieldJspBean extends AdminFeaturesPageJspBean private static final String JSP_URL_REMOVE_ATTRIBUTE_FIELD = "jsp/admin/user/attribute/DoRemoveAttributeField.jsp"; private static final AttributeService _attributeService = AttributeService.getInstance( ); private static final AttributeFieldService _attributeFieldService = AttributeFieldService.getInstance( ); + private static final String JSP_ATTRIBUTES_LIST = "jsp/admin/AdminTechnicalMenu.jsp?tab=attributes_management#users_advanced_parameters"; /** * Create attribute field @@ -145,12 +146,12 @@ public String doCreateAttributeField( HttpServletRequest request ) throws Access { if ( StringUtils.isBlank( strTitle ) ) { - return AdminMessageService.getMessageUrl( request, Messages.MANDATORY_FIELDS, AdminMessage.TYPE_STOP ); + return AdminMessageService.getMessageUrl( request, Messages.MANDATORY_FIELDS, JSP_ATTRIBUTES_LIST, AdminMessage.TYPE_STOP ); } if ( StringUtils.isBlank( strValue ) ) { - return AdminMessageService.getMessageUrl( request, Messages.MANDATORY_FIELDS, AdminMessage.TYPE_STOP ); + return AdminMessageService.getMessageUrl( request, Messages.MANDATORY_FIELDS, JSP_ATTRIBUTES_LIST, AdminMessage.TYPE_STOP ); } if ( !SecurityTokenService.getInstance( ).validate( request, TEMPLATE_CREATE_ATTRIBUTE_FIELD ) ) diff --git a/src/java/fr/paris/lutece/portal/web/workgroup/AdminWorkgroupJspBean.java b/src/java/fr/paris/lutece/portal/web/workgroup/AdminWorkgroupJspBean.java index 4861f828f7..e5b0c35a73 100644 --- a/src/java/fr/paris/lutece/portal/web/workgroup/AdminWorkgroupJspBean.java +++ b/src/java/fr/paris/lutece/portal/web/workgroup/AdminWorkgroupJspBean.java @@ -97,6 +97,7 @@ public class AdminWorkgroupJspBean extends AdminFeaturesPageJspBean private static final String TEMPLATE_CREATE_WORKGROUP = "admin/workgroup/create_workgroup.html"; private static final String TEMPLATE_MODIFY_WORKGROUP = "admin/workgroup/modify_workgroup.html"; private static final String TEMPLATE_ASSIGN_USERS = "admin/workgroup/assign_users_workgroup.html"; + private static final String JSP_PATH = "jsp/admin/workgroup/"; // Markers Freemarker private static final String MARK_WORKGROUPS_LIST = "workgroups_list"; @@ -307,11 +308,11 @@ public String getConfirmRemoveWorkgroup( HttpServletRequest request ) { String strWorkgroupKey = request.getParameter( PARAMETER_WORKGROUP_KEY ); String strUrlRemove = JSP_URL_REMOVE_WORKGROUP; - Map parameters = new HashMap<>( ); + Map parameters = new HashMap<>( ); parameters.put( PARAMETER_WORKGROUP_KEY, strWorkgroupKey ); parameters.put( SecurityTokenService.PARAMETER_TOKEN, SecurityTokenService.getInstance( ).getToken( request, JSP_URL_REMOVE_WORKGROUP ) ); - 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_PATH+JSP_MANAGE_WORKGROUPS ); } /** @@ -330,7 +331,7 @@ public String doRemoveWorkgroup( HttpServletRequest request ) throws AccessDenie if ( CollectionUtils.isNotEmpty( AdminWorkgroupHome.getUserListForWorkgroup( strWorkgroupKey ) ) ) { - return AdminMessageService.getMessageUrl( request, MESSAGE_WORKGROUP_ALREADY_USED, AdminMessage.TYPE_STOP ); + return AdminMessageService.getMessageUrl( request, MESSAGE_WORKGROUP_ALREADY_USED, JSP_PATH+JSP_MANAGE_WORKGROUPS, AdminMessage.TYPE_STOP ); } if ( !WorkgroupRemovalListenerService.getService( ).checkForRemoval( strWorkgroupKey, listErrors, getLocale( ) ) ) @@ -340,7 +341,7 @@ public String doRemoveWorkgroup( HttpServletRequest request ) throws AccessDenie strCause }; - return AdminMessageService.getMessageUrl( request, MESSAGE_CANNOT_REMOVE_WORKGROUP, args, AdminMessage.TYPE_STOP ); + return AdminMessageService.getMessageUrl( request, MESSAGE_CANNOT_REMOVE_WORKGROUP, args, JSP_PATH+JSP_MANAGE_WORKGROUPS, AdminMessage.TYPE_STOP ); } if ( !SecurityTokenService.getInstance( ).validate( request, JSP_URL_REMOVE_WORKGROUP ) ) { diff --git a/src/java/fr/paris/lutece/portal/web/xsl/XslExportJspBean.java b/src/java/fr/paris/lutece/portal/web/xsl/XslExportJspBean.java index 7f94260e5b..9511539662 100644 --- a/src/java/fr/paris/lutece/portal/web/xsl/XslExportJspBean.java +++ b/src/java/fr/paris/lutece/portal/web/xsl/XslExportJspBean.java @@ -132,6 +132,7 @@ public class XslExportJspBean extends PluginAdminPageJspBean // Jsp Definition private static final String ANCHOR_ADMIN_DASHBOARDS = "xslexport"; private static final String JSP_DO_REMOVE_XSL_EXPORT = "jsp/admin/xsl/DoRemoveXslExport.jsp"; + private static final String JSP_XSL_EXPORT_LIST = "jsp/admin/AdminTechnicalMenu.jsp?tab=xslexportManagement#users_advanced_parameters"; /** * Gets the xsl export creation page @@ -475,7 +476,7 @@ private String getXslExportData( HttpServletRequest request, XslExport xslExport I18nService.getLocalizedString( strError, getLocale( ) ) }; - return AdminMessageService.getMessageUrl( request, MESSAGE_MANDATORY_FIELD, tabRequiredFields, AdminMessage.TYPE_STOP ); + return AdminMessageService.getMessageUrl( request, MESSAGE_MANDATORY_FIELD, tabRequiredFields, JSP_XSL_EXPORT_LIST, AdminMessage.TYPE_STOP ); } // Check the XML validity of the XSL stylesheet @@ -489,7 +490,7 @@ private String getXslExportData( HttpServletRequest request, XslExport xslExport strError }; - return AdminMessageService.getMessageUrl( request, MESSAGE_XML_NOT_VALID, args, AdminMessage.TYPE_STOP ); + return AdminMessageService.getMessageUrl( request, MESSAGE_XML_NOT_VALID, args, JSP_XSL_EXPORT_LIST, AdminMessage.TYPE_STOP ); } } diff --git a/webapp/WEB-INF/templates/admin/dashboard/admin/user_admindashboard_attributes.html b/webapp/WEB-INF/templates/admin/dashboard/admin/user_admindashboard_attributes.html index 8f02eb66db..1c8fd72c73 100644 --- a/webapp/WEB-INF/templates/admin/dashboard/admin/user_admindashboard_attributes.html +++ b/webapp/WEB-INF/templates/admin/dashboard/admin/user_admindashboard_attributes.html @@ -1,7 +1,7 @@ <@tabPanel id='attributes_management'> <#assign tabTitle>#i18n{portal.users.manage_attributes.pageTitle} <@pageHeader title="${tabTitle}"> -<@tform type='inline' method='post' align="middle" action='jsp/admin/user/attribute/CreateAttribute.jsp'> +<@tform type='inline' method='get' align="middle" action='jsp/admin/user/attribute/CreateAttribute.jsp'> <@formGroup labelFor='attribute_type_class_name' formStyle='inline' groupStyle="inline" class='has-addons'> <@inputGroup class=''> <@select id='attribute_type_class_name' name='attribute_type_class_name' size='sm'>