Author: tchemit Date: 2012-01-06 19:14:38 +0100 (Fri, 06 Jan 2012) New Revision: 246 Url: http://forge.codelutin.com/repositories/revision/echobase/246 Log: - review User CRUD (make it simple!) - improve log config - i18n Added: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/user/Create.java trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/user/Delete.java trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/user/Update.java trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/user/Create.jsp trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/user/Delete.jsp trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/user/Update.jsp Removed: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/user/ManageUser.java trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/user/ManageUser-validation.xml trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/user/userForm.jsp Modified: trunk/echobase-ui/src/main/env/dev/resources/log4j.xml trunk/echobase-ui/src/main/env/prod/resources/log4j.xml trunk/echobase-ui/src/main/resources/config/struts-user.xml trunk/echobase-ui/src/main/resources/i18n/echobase-ui_fr_FR.properties trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/embeddedApplication/result.jsp trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/user/userList.jsp Modified: trunk/echobase-ui/src/main/env/dev/resources/log4j.xml =================================================================== --- trunk/echobase-ui/src/main/env/dev/resources/log4j.xml 2012-01-06 18:13:48 UTC (rev 245) +++ trunk/echobase-ui/src/main/env/dev/resources/log4j.xml 2012-01-06 18:14:38 UTC (rev 246) @@ -27,8 +27,7 @@ <layout class="org.apache.log4j.PatternLayout"> <!-- The default pattern: Date Priority [Category] Message\n --> - <param name="ConversionPattern" - value="%d{ABSOLUTE} %-5p [%c{1}] %m%n"/> + <param name="ConversionPattern" value="%d{ABSOLUTE} %-5p [%c] %m%n"/> </layout> </appender> Modified: trunk/echobase-ui/src/main/env/prod/resources/log4j.xml =================================================================== --- trunk/echobase-ui/src/main/env/prod/resources/log4j.xml 2012-01-06 18:13:48 UTC (rev 245) +++ trunk/echobase-ui/src/main/env/prod/resources/log4j.xml 2012-01-06 18:14:38 UTC (rev 246) @@ -29,8 +29,7 @@ <layout class="org.apache.log4j.PatternLayout"> <!-- The default pattern: Date Priority [Category] Message\n --> - <param name="ConversionPattern" - value="%d{ABSOLUTE} %-5p [%c{1}] %m%n"/> + <param name="ConversionPattern" value="%d{ABSOLUTE} %-5p [%c] %m%n"/> </layout> </appender> Added: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/user/Create.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/user/Create.java (rev 0) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/user/Create.java 2012-01-06 18:14:38 UTC (rev 246) @@ -0,0 +1,98 @@ +package fr.ifremer.echobase.ui.actions.user; + +import fr.ifremer.echobase.entities.EchoBaseUser; +import fr.ifremer.echobase.entities.EchoBaseUserDTO; +import fr.ifremer.echobase.entities.EchoBaseUserDTOImpl; +import fr.ifremer.echobase.services.UserService; +import fr.ifremer.echobase.ui.actions.EchoBaseActionSupport; +import org.apache.commons.lang3.StringUtils; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; + +/** + * To create a user. + * + * @author tchemit <chemit@codelutin.com> + * @since 0.2 + */ +public class Create extends EchoBaseActionSupport { + + protected static final Log log = LogFactory.getLog(Create.class); + + private static final long serialVersionUID = 1L; + + protected transient UserService userService; + + protected EchoBaseUserDTO user; + + public UserService getUserService() { + if (userService == null) { + userService = newService(UserService.class); + } + return userService; + } + + public String execute() throws Exception { + EchoBaseUserDTO user = getUser(); + String userEmail = user.getEmail(); + + if (log.isInfoEnabled()) { + log.info("will create user " + userEmail); + } + + // create user + getUserService().createOrUpdate(user); + + // add info message + addActionMessage(_("echobase.info.user.create", userEmail)); + return SUCCESS; + } + + @Override + public void validate() { + + EchoBaseUserDTO user = getUser(); + String userEmail = user.getEmail(); + + // login + password required + if (StringUtils.isEmpty(userEmail)) { + + // empty user login + addFieldError("user.email", + _("echobase.error.required.email")); + } else { + + // check login not already used + EchoBaseUser login; + try { + login = getUserService().getUserByEmail(userEmail); + } catch (Exception e) { + + // could not get user + throw new IllegalStateException( + "Could not obtain user " + userEmail, e); + } + if (login != null) { + addFieldError("user.email", + _("echobase.error.email.already.used")); + } + } + + String userPassword = user.getPassword(); + if (StringUtils.isEmpty(userPassword)) { + + // empty user password + addFieldError("user.password", + _("echobase.error.required.password")); + } + + } + + public EchoBaseUserDTO getUser() { + if (user == null) { + user = new EchoBaseUserDTOImpl(); + } + return user; + } + +} \ No newline at end of file Added: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/user/Delete.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/user/Delete.java (rev 0) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/user/Delete.java 2012-01-06 18:14:38 UTC (rev 246) @@ -0,0 +1,74 @@ +package fr.ifremer.echobase.ui.actions.user; + +import com.opensymphony.xwork2.Preparable; +import fr.ifremer.echobase.entities.EchoBaseUser; +import fr.ifremer.echobase.entities.EchoBaseUserDTO; +import fr.ifremer.echobase.entities.EchoBaseUserDTOImpl; +import fr.ifremer.echobase.services.UserService; +import fr.ifremer.echobase.ui.actions.EchoBaseActionSupport; +import org.apache.commons.lang3.StringUtils; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; + +/** + * To delete a user. + * + * @author tchemit <chemit@codelutin.com> + * @since 0.2 + */ +public class Delete extends EchoBaseActionSupport implements Preparable { + + protected static final Log log = LogFactory.getLog(Delete.class); + + private static final long serialVersionUID = 1L; + + protected transient UserService userService; + + protected EchoBaseUserDTO user; + + public UserService getUserService() { + if (userService == null) { + userService = newService(UserService.class); + } + return userService; + } + + public String execute() throws Exception { + + EchoBaseUserDTO user = getUser(); + String userEmail = user.getEmail(); + + if (log.isInfoEnabled()) { + log.info("will delete user " + userEmail); + } + + // delete user + getUserService().delete(user); + + // add info message + addActionMessage(_("echobase.info.user.delete", userEmail)); + return SUCCESS; + } + + public EchoBaseUserDTO getUser() { + if (user == null) { + user = new EchoBaseUserDTOImpl(); + } + return user; + } + + @Override + public void prepare() throws Exception { + String userId = getUser().getId(); + if (!StringUtils.isEmpty(userId)) { + + // load user + user = getUserService().getEntityById(EchoBaseUser.class, userId).toDTO(); + + if (log.isInfoEnabled()) { + log.info("Selected user " + user.getEmail()); + } + } + + } +} \ No newline at end of file Deleted: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/user/ManageUser.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/user/ManageUser.java 2012-01-06 18:13:48 UTC (rev 245) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/user/ManageUser.java 2012-01-06 18:14:38 UTC (rev 246) @@ -1,187 +0,0 @@ -/* - * #%L - * EchoBase :: UI - * - * $Id$ - * $HeadURL$ - * %% - * Copyright (C) 2011 Ifremer, Codelutin - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - * #L% - */ -package fr.ifremer.echobase.ui.actions.user; - -import com.opensymphony.xwork2.Preparable; -import fr.ifremer.echobase.entities.EchoBaseUser; -import fr.ifremer.echobase.entities.EchoBaseUserDTO; -import fr.ifremer.echobase.entities.EchoBaseUserDTOImpl; -import fr.ifremer.echobase.services.UserService; -import fr.ifremer.echobase.ui.actions.EchoBaseActionSupport; -import fr.ifremer.echobase.ui.actions.EditActionEnum; -import org.apache.commons.lang3.StringUtils; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; - -/** - * Action to manage user (create - update - change password,...) - * - * @author sletellier <letellier@codelutin.com> - * @since 0.1 - */ -public class ManageUser extends EchoBaseActionSupport implements Preparable { - - protected static final Log log = LogFactory.getLog(ManageUser.class); - - private static final long serialVersionUID = 1L; - - public static final String BACK_TO_LIST = "backToList"; - - protected transient UserService userService; - - protected EchoBaseUserDTO user; - - protected String userEditAction; - - public String getUserEditAction() { - return userEditAction; - } - - public void setUserEditAction(String userEditAction) { - this.userEditAction = userEditAction; - } - - protected UserService getUserService() { - if (userService == null) { - userService = newService(UserService.class); - } - return userService; - } - - @Override - public void prepare() throws Exception { - - String userId = getUser().getId(); - if (!StringUtils.isEmpty(userId)) { - - // load user - user = getUserService().getEntityById(EchoBaseUser.class, userId).toDTO(); - - log.info("Selected user " + user.getEmail()); - } - } - - public String doCreateOrUpdate() throws Exception { - EchoBaseUserDTO user = getUser(); - String userEmail = user.getEmail(); - - if (log.isInfoEnabled()) { - log.info("will create user " + userEmail); - } - - // create user - getUserService().createOrUpdate(user); - return BACK_TO_LIST; - } - - public String doDelete() throws Exception { - EchoBaseUserDTO user = getUser(); - String userEmail = user.getEmail(); - - if (log.isInfoEnabled()) { - log.info("will delete user " + userEmail); - } - getUserService().delete(user); - return BACK_TO_LIST; - } - - @Override - public void validate() { - - EditActionEnum action = getEditActionEnum(); - - log.info("Edit action : " + action); - - if (action == null) { - - // no validation (no edit action) - return; - } - - EchoBaseUserDTO user = getUser(); - String userEmail = user.getEmail(); - - switch (action) { - - case CREATE: - - // login + password required - if (StringUtils.isEmpty(userEmail)) { - - // empty user login - addFieldError("user.email", - _("echobase.error.required.email")); - } else { - - // check login not already used - EchoBaseUser login; - try { - login = getUserService().getUserByEmail(userEmail); - } catch (Exception e) { - - // could not get user - throw new IllegalStateException( - "Could not obtain user " + userEmail, e); - } - if (login != null) { - addFieldError("user.email", - _("echobase.error.email.already.used")); - } - } - - String userPassword = user.getPassword(); - if (StringUtils.isEmpty(userPassword)) { - - // empty user password - addFieldError("user.password", - _("echobase.error.required.password")); - } - - break; - case EDIT: - - // at the moment nothing to validate - break; - case DELETE: - - // Do nothing - default: - // nothing to validate - } - } - - public EchoBaseUserDTO getUser() { - if (user == null) { - user = new EchoBaseUserDTOImpl(); - } - return user; - } - - protected EditActionEnum getEditActionEnum() { - if (userEditAction == null) { - return null; - } - return EditActionEnum.valueOf(userEditAction); - } -} Added: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/user/Update.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/user/Update.java (rev 0) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/user/Update.java 2012-01-06 18:14:38 UTC (rev 246) @@ -0,0 +1,74 @@ +package fr.ifremer.echobase.ui.actions.user; + +import com.opensymphony.xwork2.Preparable; +import fr.ifremer.echobase.entities.EchoBaseUser; +import fr.ifremer.echobase.entities.EchoBaseUserDTO; +import fr.ifremer.echobase.entities.EchoBaseUserDTOImpl; +import fr.ifremer.echobase.services.UserService; +import fr.ifremer.echobase.ui.actions.EchoBaseActionSupport; +import org.apache.commons.lang3.StringUtils; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; + +/** + * To update a user. + * + * @author tchemit <chemit@codelutin.com> + * @since 0.2 + */ +public class Update extends EchoBaseActionSupport implements Preparable { + + protected static final Log log = LogFactory.getLog(Update.class); + + private static final long serialVersionUID = 1L; + + protected transient UserService userService; + + protected EchoBaseUserDTO user; + + public UserService getUserService() { + if (userService == null) { + userService = newService(UserService.class); + } + return userService; + } + + @Override + public String execute() throws Exception { + EchoBaseUserDTO user = getUser(); + String userEmail = user.getEmail(); + + if (log.isInfoEnabled()) { + log.info("will update user " + userEmail); + } + + // update user + getUserService().createOrUpdate(user); + + // add info message + addActionMessage(_("echobase.info.user.update", userEmail)); + return SUCCESS; + } + + @Override + public void prepare() throws Exception { + String userId = getUser().getId(); + if (!StringUtils.isEmpty(userId)) { + + // load user + user = getUserService().getEntityById(EchoBaseUser.class, userId).toDTO(); + + if (log.isInfoEnabled()) { + log.info("Selected user " + user.getEmail()); + } + } + } + + public EchoBaseUserDTO getUser() { + if (user == null) { + user = new EchoBaseUserDTOImpl(); + } + return user; + } + +} \ No newline at end of file Modified: trunk/echobase-ui/src/main/resources/config/struts-user.xml =================================================================== --- trunk/echobase-ui/src/main/resources/config/struts-user.xml 2012-01-06 18:13:48 UTC (rev 245) +++ trunk/echobase-ui/src/main/resources/config/struts-user.xml 2012-01-06 18:14:38 UTC (rev 246) @@ -53,20 +53,19 @@ </action> <!-- Display lists of users --> - <action name="userList" class="fr.ifremer.echobase.ui.actions.user.ManageUser"> + <action name="userList" class="fr.ifremer.echobase.ui.actions.EchoBaseActionSupport"> <interceptor-ref name="basicStackLoggued"/> <interceptor-ref name="checkUserIsAdmin"/> <result>/WEB-INF/jsp/user/userList.jsp</result> </action> - <!-- Get detail of a user --> - <action name="userForm" class="fr.ifremer.echobase.ui.actions.user.ManageUser" - method="input"> + <!-- CRUD on user --> + <action name="user-*" + class="fr.ifremer.echobase.ui.actions.user.{1}"> <interceptor-ref name="paramsPrepareParamsStackLoggued"/> <interceptor-ref name="checkUserIsAdmin"/> - <result name="input">/WEB-INF/jsp/user/userForm.jsp</result> - <result>/WEB-INF/jsp/user/userForm.jsp</result> - <result name="backToList" type="redirectAction">userList</result> + <result name="input">/WEB-INF/jsp/user/{1}.jsp</result> + <result>/WEB-INF/jsp/user/userList.jsp</result> </action> <!-- Get db modifications --> Deleted: trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/user/ManageUser-validation.xml =================================================================== --- trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/user/ManageUser-validation.xml 2012-01-06 18:13:48 UTC (rev 245) +++ trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/user/ManageUser-validation.xml 2012-01-06 18:14:38 UTC (rev 246) @@ -1,43 +0,0 @@ -<!-- - #%L - EchoBase :: UI - - $Id$ - $HeadURL$ - %% - Copyright (C) 2011 Ifremer, Codelutin - %% - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU Affero General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. - #L% - --> -<!DOCTYPE validators PUBLIC - "-//OpenSymphony Group//XWork Validator 1.0.2//EN" - "http://www.opensymphony.com/xwork/xwork-validator-1.0.2.dtd"> -<validators> - - <field name="user.email"> - - <field-validator type="login"> - <message key="echobase.error.login.wrongLogin"/> - </field-validator> - </field> - - <field name="user.password"> - - <field-validator type="requiredstring"> - <message key="echobase.error.login.password.requiredstring"/> - </field-validator> - </field> - -</validators> \ No newline at end of file Modified: trunk/echobase-ui/src/main/resources/i18n/echobase-ui_fr_FR.properties =================================================================== --- trunk/echobase-ui/src/main/resources/i18n/echobase-ui_fr_FR.properties 2012-01-06 18:13:48 UTC (rev 245) +++ trunk/echobase-ui/src/main/resources/i18n/echobase-ui_fr_FR.properties 2012-01-06 18:14:38 UTC (rev 246) @@ -36,7 +36,7 @@ echobase.common.password=Mot de passe echobase.common.user=Utilisateur echobase.error.bad.password=Mot de passe incorrrect -echobase.error.email.already.used= +echobase.error.email.already.used=Nom d'utilisateur déjà pris echobase.error.export.description.requiredstring=La description de l'export est obligatoire echobase.error.export.name.requiredstring=Le nom de l'export est obligatoire echobase.error.export.sqlQuery.requiredstring=La requête de l'export est obligatoire @@ -68,6 +68,12 @@ echobase.info.no.sqlQuery.selected=Aucune requête d'export sql sélectionnée echobase.info.no.table.selected=Aucune table sélectionnée echobase.info.no.voyagee.found=Aucune campagne à exporter +echobase.info.user.create=L'utilisateur '%s' a été créée +echobase.info.user.delete=L'utilisateur '%s' a été supprimé +echobase.info.user.update=L'utilisateur '%s' a été mis à jour +echobase.label.admin.user.create=Création d'un utilisateur +echobase.label.admin.user.delete=Suppression d'un utilisateur +echobase.label.admin.user.edit=Mise à jour d'un utilisateur echobase.label.createIfNotFound=Créer les entités non trouvées en base echobase.label.embeddedApplicationFileName=Nom de l'archive à télécharger echobase.label.embeddedWarFileName=Nom du war à utiliser Modified: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/embeddedApplication/result.jsp =================================================================== --- trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/embeddedApplication/result.jsp 2012-01-06 18:13:48 UTC (rev 245) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/embeddedApplication/result.jsp 2012-01-06 18:14:38 UTC (rev 246) @@ -46,7 +46,7 @@ <div> Si le téléchargement n'a pas démarré automatiquement, suivez ce lien : - <a href="${downloadUrl}" target="download"> + <a href="${downloadUrl}"> <s:text name="echobase.action.downloadEmbeddedApplicationFile"/> </a> </div> Added: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/user/Create.jsp =================================================================== --- trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/user/Create.jsp (rev 0) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/user/Create.jsp 2012-01-06 18:14:38 UTC (rev 246) @@ -0,0 +1,52 @@ +<%-- + #%L + EchoBase :: UI + + $Id: userForm.jsp 75 2011-11-14 09:15:15Z sletellier $ + $HeadURL: http://svn.forge.codelutin.com/svn/echobase/trunk/echobase-ui/src/main/webap... $ + %% + Copyright (C) 2011 Ifremer, Codelutin + %% + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU Affero General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see <http://www.gnu.org/licenses/>. + #L% + --%> +<%@page contentType="text/html" pageEncoding="UTF-8" %> +<%@ taglib prefix="s" uri="/struts-tags" %> +<%@ taglib prefix="sjg" uri="/struts-jquery-grid-tags" %> + +<title><s:text name="echobase.label.admin.user.create"/></title> + +<h2><s:text name="echobase.label.admin.user.create"/></h2> + +<s:form method="post" validate="true" namespace="/user"> + <fieldset> + <legend> + <s:text name="echobase.common.user"/> + </legend> + <s:textfield key="user.email" label="%{getText('echobase.common.email')}" + size="40" required="true"/> + <s:password key="user.password" + label="%{getText('echobase.common.password')}" + size="40" required="true"/> + <s:checkbox key="user.admin" label="%{getText('echobase.common.admin')}"/> + </fieldset> + <ul class="toolbar floatRight"> + <li><s:submit action="user-Create" key="echobase.action.create" + theme="simple"/></li> + <li><s:submit action="userList" key="echobase.action.backToUserList" + theme="simple"/></li> + </ul> +</s:form> + + Added: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/user/Delete.jsp =================================================================== --- trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/user/Delete.jsp (rev 0) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/user/Delete.jsp 2012-01-06 18:14:38 UTC (rev 246) @@ -0,0 +1,51 @@ +<%-- + #%L + EchoBase :: UI + + $Id: userForm.jsp 75 2011-11-14 09:15:15Z sletellier $ + $HeadURL: http://svn.forge.codelutin.com/svn/echobase/trunk/echobase-ui/src/main/webap... $ + %% + Copyright (C) 2011 Ifremer, Codelutin + %% + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU Affero General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see <http://www.gnu.org/licenses/>. + #L% + --%> +<%@page contentType="text/html" pageEncoding="UTF-8" %> +<%@ taglib prefix="s" uri="/struts-tags" %> +<%@ taglib prefix="sjg" uri="/struts-jquery-grid-tags" %> + +<title><s:text name="echobase.label.admin.user.delete"/></title> + +<h2><s:text name="echobase.label.admin.user.delete"/></h2> + +<s:form method="post" validate="true" namespace="/user"> + <fieldset> + <legend> + <s:text name="echobase.common.user"/> + </legend> + <s:hidden name="user.id" label=""/> + <s:textfield key="user.email" label="%{getText('echobase.common.email')}" + size="40" disabled="true"/> + <s:checkbox value="%{user.admin}" key="echobase.common.admin" + disabled="true"/> + </fieldset> + <ul class="toolbar floatRight"> + <li><s:submit action="user-Delete" + key="echobase.action.delete" theme="simple"/></li> + <li><s:submit action="userList" key="echobase.action.backToUserList" + theme="simple"/></li> + </ul> +</s:form> + + Added: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/user/Update.jsp =================================================================== --- trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/user/Update.jsp (rev 0) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/user/Update.jsp 2012-01-06 18:14:38 UTC (rev 246) @@ -0,0 +1,56 @@ +<%-- + #%L + EchoBase :: UI + + $Id: userForm.jsp 75 2011-11-14 09:15:15Z sletellier $ + $HeadURL: http://svn.forge.codelutin.com/svn/echobase/trunk/echobase-ui/src/main/webap... $ + %% + Copyright (C) 2011 Ifremer, Codelutin + %% + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU Affero General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see <http://www.gnu.org/licenses/>. + #L% + --%> +<%@page contentType="text/html" pageEncoding="UTF-8" %> +<%@ taglib prefix="s" uri="/struts-tags" %> +<%@ taglib prefix="sjg" uri="/struts-jquery-grid-tags" %> + +<title><s:text name="echobase.label.admin.user.edit"/></title> + +<h2><s:text name="echobase.label.admin.user.edit"/></h2> + +<s:form method="post" validate="true" namespace="/user"> + <fieldset> + <legend> + <s:text name="echobase.common.user"/> + </legend> + <s:hidden key="user.id" label=""/> + <s:textfield key="user.email" label="%{getText('echobase.common.email')}" + size="40" readonly="true"/> + <s:password name="user.password" value="" label="%{getText('echobase.common.password')} (*)" + size="40"/> + <s:checkbox key="user.admin" label="%{getText('echobase.common.admin')}"/> + <br/> + <div class="cleanBoth"> + (*) Pour ne pas modifier le mot de passe laisser ce champs vide + </div> + </fieldset> + <ul class="toolbar floatRight"> + <li><s:submit action="user-Update" + key="echobase.action.save" theme="simple"/></li> + <li><s:submit action="userList" key="echobase.action.backToUserList" + theme="simple"/></li> + </ul> +</s:form> + + Deleted: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/user/userForm.jsp =================================================================== --- trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/user/userForm.jsp 2012-01-06 18:13:48 UTC (rev 245) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/user/userForm.jsp 2012-01-06 18:14:38 UTC (rev 246) @@ -1,128 +0,0 @@ -<%-- - #%L - EchoBase :: UI - - $Id$ - $HeadURL$ - %% - Copyright (C) 2011 Ifremer, Codelutin - %% - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU Affero General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. - #L% - --%> -<%@ page import="fr.ifremer.echobase.ui.actions.EditActionEnum" %> -<%@page contentType="text/html" pageEncoding="UTF-8" %> -<%@ taglib prefix="s" uri="/struts-tags" %> -<%@ taglib prefix="sjg" uri="/struts-jquery-grid-tags" %> - -<script type="text/javascript" - src="<s:url value='/js/gridHelper.js' />"></script> - -<%-- CRUD constants --%> -<s:set name="create"><%=EditActionEnum.CREATE.toString()%> -</s:set> -<s:set name="edit"><%=EditActionEnum.EDIT.toString()%> -</s:set> -<s:set name="delete"><%=EditActionEnum.DELETE.toString()%> -</s:set> - -<s:if test="userEditAction == #create"> - <s:set name="title"><s:text name="echobase.label.admin.user.create"/></s:set> -</s:if> -<s:elseif test="userEditAction == #edit"> - <s:set name="title"><s:text name="echobase.label.admin.user.edit"/></s:set> -</s:elseif> -<s:elseif test="userEditAction == #delete"> - <s:set name="title"><s:text name="echobase.label.admin.user.delete"/></s:set> -</s:elseif> - -<title><s:property value="#title"/></title> - -<h2><s:property value="#title"/></h2> - -<s:if test="userEditAction == #create"> - - <%--Create user--%> - - <s:form method="post" validate="true" namespace="/user"> - <fieldset> - <legend> - <s:text name="echobase.common.user"/> - </legend> - <s:hidden key="userEditAction" label=""/> - <s:textfield key="user.email" label="%{getText('echobase.common.email')}" - size="40" required="true"/> - <s:password key="user.password" - label="%{getText('echobase.common.password')}" - size="40" required="true"/> - <s:checkbox key="user.admin" label="%{getText('echobase.common.admin')}"/> - </fieldset> - <ul class="toolbar floatRight"> - <li><s:submit action="userForm" method="doCreateOrUpdate" - key="echobase.action.create" theme="simple"/></li> - <li><s:submit action="userList" key="echobase.action.backToUserList" - theme="simple"/></li> - </ul> - </s:form> -</s:if> -<s:elseif test="userEditAction == #edit"> - - <%--Update user--%> - - <s:form method="post" validate="true" namespace="/user"> - <fieldset> - <legend> - <s:text name="echobase.common.user"/> - </legend> - <s:hidden key="user.id" label=""/> - <s:hidden key="userEditAction" label=""/> - <s:textfield key="user.email" label="%{getText('echobase.common.email')}" - size="40"/> - <s:password name="user.password" value="" key="echobase.common.password" - size="40"/> - <s:checkbox value="%{user.admin}" key="echobase.common.admin"/> - </fieldset> - <ul class="toolbar floatRight"> - <li><s:submit action="userForm" method="doCreateOrUpdate" - key="echobase.action.save" theme="simple"/></li> - <li><s:submit action="userList" key="echobase.action.backToUserList" - theme="simple"/></li> - </ul> - </s:form> -</s:elseif> -<s:elseif test="userEditAction == #delete"> - - <%--Delete user--%> - - <s:form method="post" validate="true" namespace="/user"> - <fieldset> - <legend> - <s:text name="echobase.common.user"/> - </legend> - <s:hidden name="user.id" label=""/> - <s:hidden name="userEditAction" label=""/> - <s:textfield key="user.email" label="%{getText('echobase.common.email')}" - size="40" disabled="true"/> - <s:checkbox value="%{user.admin}" key="echobase.common.admin" - disabled="true"/> - </fieldset> - <ul class="toolbar floatRight"> - <li><s:submit action="userForm" method="doDelete" - key="echobase.action.delete" theme="simple"/></li> - <li><s:submit action="userList" key="echobase.action.backToUserList" - theme="simple"/></li> - </ul> - </s:form> -</s:elseif> - Modified: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/user/userList.jsp =================================================================== --- trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/user/userList.jsp 2012-01-06 18:13:48 UTC (rev 245) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/user/userList.jsp 2012-01-06 18:14:38 UTC (rev 246) @@ -31,17 +31,11 @@ <s:url id="loadUrl" action="getUsers" namespace="/user" escapeAmp="false"/> -<s:url id="addUrl" action="userForm" namespace="/user" escapeAmp="false" method="input"> - <s:param name="userEditAction"><%=EditActionEnum.CREATE%></s:param> -</s:url> +<s:url id="addUrl" action="user-Create" namespace="/user" escapeAmp="false" method="input"/> -<s:url id="editUrl" action="userForm" namespace="/user" escapeAmp="false" method="input"> - <s:param name="userEditAction"><%=EditActionEnum.EDIT%></s:param> -</s:url> +<s:url id="editUrl" action="user-Update" namespace="/user" escapeAmp="false" method="input"/> -<s:url id="delUrl" action="userForm" namespace="/user" escapeAmp="false" method="input"> - <s:param name="userEditAction"><%=EditActionEnum.DELETE%></s:param> -</s:url> +<s:url id="delUrl" action="user-Delete" namespace="/user" escapeAmp="false" method="input"/> <script type="text/javascript">