Author: tchemit Date: 2011-11-11 03:13:58 +0100 (Fri, 11 Nov 2011) New Revision: 35 Url: http://forge.codelutin.com/repositories/revision/echobase/35 Log: continue dbEditor (edit foreign keys) clean i18n rename Survey to Voyage improve JSON action and ImportAction Added: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/dbeditor/GetForeignEntities.java trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/dbeditor/foreignEntities.jsp Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/EchoBaseTopiaTransactionFilter.java trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/EchoBaseActionSupport.java trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/ImportAction.java trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/UserAction.java trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/dbeditor/LoadEntities.java trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/json/AbstractJSONPaginedAction.java trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/json/GetEntities.java trunk/echobase-ui/src/main/resources/config/struts-dbeditor.xml trunk/echobase-ui/src/main/resources/i18n/echobase-ui_fr_FR.properties trunk/echobase-ui/src/main/webapp/WEB-INF/decorators.xml trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/dbeditor/dbeditor.jsp trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/import/import.jsp Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/EchoBaseTopiaTransactionFilter.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/EchoBaseTopiaTransactionFilter.java 2011-11-11 02:11:50 UTC (rev 34) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/EchoBaseTopiaTransactionFilter.java 2011-11-11 02:13:58 UTC (rev 35) @@ -33,7 +33,7 @@ import org.nuiton.web.filter.TopiaTransactionFilter; /** - * TODO + * EchoBase implementation of the {@link TopiaTransactionFilter}. * * @author tchemit <chemit@codelutin.com> * @since 0.1 Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/EchoBaseActionSupport.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/EchoBaseActionSupport.java 2011-11-11 02:11:50 UTC (rev 34) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/EchoBaseActionSupport.java 2011-11-11 02:13:58 UTC (rev 35) @@ -25,6 +25,7 @@ import com.opensymphony.xwork2.ActionContext; import fr.ifremer.echobase.EchoBaseConfiguration; +import fr.ifremer.echobase.services.DecoratorService; import fr.ifremer.echobase.services.EchoBaseService; import fr.ifremer.echobase.services.EchoBaseServiceContext; import fr.ifremer.echobase.services.EchoBaseServiceContextImpl; @@ -34,12 +35,15 @@ import org.apache.struts2.StrutsStatics; import org.nuiton.topia.TopiaContext; import org.nuiton.topia.framework.TopiaTransactionAware; +import org.nuiton.topia.persistence.TopiaEntity; import org.nuiton.web.filter.TopiaTransactionFilter; import org.nuiton.web.struts2.BaseAction; import javax.servlet.http.HttpServletRequest; import java.text.SimpleDateFormat; +import java.util.Collection; import java.util.Date; +import java.util.Locale; import java.util.Map; /** @@ -67,6 +71,8 @@ private SimpleDateFormat monthFormat; + private transient DecoratorService decoratorService; + public static EchoBaseApplicationContext getEchoBaseApplicationContext() { Map<String, Object> application = getActionContext().getApplication(); EchoBaseApplicationContext applicationContext = @@ -182,6 +188,10 @@ return result; } + public <E extends TopiaEntity> Map<String, String> sortAndDecorate(Collection<E> beans, String context) { + return getDecoratorService().sortAndDecorate(getLocale(), beans, context); + } + protected SimpleDateFormat getDateFormat() { if (dateFormat == null) { dateFormat = new SimpleDateFormat("dd/MM/yyyy"); @@ -196,6 +206,13 @@ return monthFormat; } + protected DecoratorService getDecoratorService() { + if (decoratorService==null) { + decoratorService = newService(DecoratorService.class); + } + return decoratorService; + } + protected static ActionContext getActionContext() { return ActionContext.getContext(); } Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/ImportAction.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/ImportAction.java 2011-11-11 02:11:50 UTC (rev 34) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/ImportAction.java 2011-11-11 02:13:58 UTC (rev 35) @@ -23,9 +23,8 @@ */ package fr.ifremer.echobase.ui.actions; -import com.google.common.collect.Maps; -import fr.ifremer.echobase.entities.Survey; -import fr.ifremer.echobase.services.SurveyService; +import fr.ifremer.echobase.entities.Voyage; +import fr.ifremer.echobase.services.VoyageService; import fr.ifremer.echobase.services.models.ImportModel; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -47,7 +46,7 @@ protected ImportModel importModel; - protected Map<String, String> surveys; + protected Map<String, String> voyages; public ImportModel getImportModel() { if (importModel == null) { @@ -56,38 +55,28 @@ return importModel; } - public void setImportModel(ImportModel importModel) { - this.importModel = importModel; + public String getSelectedVoyageId() { + String selectedVoyageId = getImportModel().getSelectedVoyageId(); + return selectedVoyageId; } - public String getSelectedSurvey() { - Survey surveySelected = getImportModel().getSurveySelected(); - if (surveySelected == null) { - return null; - } - return surveySelected.getTopiaId(); + public void setSelectedVoyageId(String selectedVoyageId) { + VoyageService service = newService(VoyageService.class); + Voyage selectedVoyage = service.getVoyageById(selectedVoyageId); + getImportModel().setSelectedVoyage(selectedVoyage); } - public void setSelectedSurvey(String selectedSurveyId) { - Survey selectedSurvey = newService(SurveyService.class).getSurveyById(selectedSurveyId); - getImportModel().setSurveySelected(selectedSurvey); + public Map<String, String> getVoyages() { + return voyages; } - public Map<String, String> getSurveys() { - return surveys; - } - @Override public String input() throws Exception { - SurveyService service = newService(SurveyService.class); - List<Survey> allSurveys = service.getSurveys(); + VoyageService service = newService(VoyageService.class); + List<Voyage> allVoyages = service.getVoyages(); + voyages = sortAndDecorate(allVoyages, null); - surveys = Maps.newHashMap(); - for (Survey survey : allSurveys) { - surveys.put(survey.getTopiaId(), survey.getName()); - } - return INPUT; } @@ -99,8 +88,9 @@ @Override public void validate() { + //FIXME : do a real validation with a xml validation file. if (!importModel.validate()) { - addActionError(getText("echobase.error.importArgument")); + addActionError(_("echobase.error.importArgument")); } } } Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/UserAction.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/UserAction.java 2011-11-11 02:11:50 UTC (rev 34) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/UserAction.java 2011-11-11 02:13:58 UTC (rev 35) @@ -128,7 +128,8 @@ if (StringUtils.isEmpty(userEmail)) { // empty user login - addFieldError("user.email", _("echobase.error.required.email")); + addFieldError("user.email", + _("echobase.error.required.email")); } else { // check login not already used @@ -142,7 +143,8 @@ "Could not obtain user " + userEmail, e); } if (login != null) { - addFieldError("user.email", _("echobase.error.email.already.used")); + addFieldError("user.email", + _("echobase.error.email.already.used")); } } @@ -150,7 +152,8 @@ if (StringUtils.isEmpty(userPassword)) { // empty user password - addFieldError("user.password", _("echobase.error.required.password")); + addFieldError("user.password", + _("echobase.error.required.password")); } break; Added: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/dbeditor/GetForeignEntities.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/dbeditor/GetForeignEntities.java (rev 0) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/dbeditor/GetForeignEntities.java 2011-11-11 02:13:58 UTC (rev 35) @@ -0,0 +1,64 @@ +/* + * #%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.dbeditor; + +import fr.ifremer.echobase.services.DbEditorService; +import fr.ifremer.echobase.ui.actions.EchoBaseActionSupport; +import org.nuiton.topia.persistence.TopiaEntity; + +import java.util.List; +import java.util.Map; + +/** + * Obtains the html select form for the given entity type. + * + * @author tchemit <chemit@codelutin.com> + * @since 0.1 + */ +public class GetForeignEntities extends EchoBaseActionSupport { + + private static final long serialVersionUID = 1L; + + protected Map<String, String> entities; + + protected String entityType; + + public void setEntityType(String entityType) { + this.entityType = entityType; + } + + public Map<String, String> getEntities() { + return entities; + } + + @Override + public String execute() throws Exception { + + DbEditorService service = newService(DbEditorService.class); + List<TopiaEntity> foreignEntities = service.getForeignDatas(entityType); + entities = sortAndDecorate(foreignEntities, null); + + return SUCCESS; + } +} Property changes on: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/dbeditor/GetForeignEntities.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/dbeditor/LoadEntities.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/dbeditor/LoadEntities.java 2011-11-11 02:11:50 UTC (rev 34) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/dbeditor/LoadEntities.java 2011-11-11 02:13:58 UTC (rev 35) @@ -30,6 +30,7 @@ import fr.ifremer.echobase.services.DbEditorService; import fr.ifremer.echobase.ui.actions.EchoBaseActionSupport; import org.apache.commons.lang.StringUtils; +import org.nuiton.topia.persistence.TopiaEntity; import java.util.List; import java.util.Map; @@ -92,4 +93,26 @@ } return INPUT; } + + public String getEditType(ColumnMeta meta) { + Class<?> type = meta.getType(); + String editType="text"; + if (boolean.class.equals(type)) { + editType = "checkbox"; + } else if (TopiaEntity.class.isAssignableFrom(type)) { + editType = "select"; + } + return editType; + } + + public String getFormatter(ColumnMeta meta) { + Class<?> type = meta.getType(); + String editType="'string'"; + if (boolean.class.equals(type)) { + editType = "'checkbox'"; + } else if (TopiaEntity.class.isAssignableFrom(type)) { + editType = "'formatEntityLabel'"; + } + return editType; + } } Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/json/AbstractJSONPaginedAction.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/json/AbstractJSONPaginedAction.java 2011-11-11 02:11:50 UTC (rev 34) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/json/AbstractJSONPaginedAction.java 2011-11-11 02:13:58 UTC (rev 35) @@ -49,12 +49,6 @@ protected Pager pager = new Pager(); -// //get how many rows we want to have into the grid - rowNum attribute in the grid -// protected Integer rows = 0; -// -// //Get the requested page. By default grid sets this to 1. -// protected Integer page = 0; - // sorting order - asc or desc protected String sord; @@ -63,12 +57,6 @@ protected String filters; -// // Your Total Pages -// protected Integer total = 0; -// -// // All Record -// protected Integer records = 0; - /** Prefix added to the sidx when used. */ protected final String sidx_prefix; Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/json/GetEntities.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/json/GetEntities.java 2011-11-11 02:11:50 UTC (rev 34) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/json/GetEntities.java 2011-11-11 02:13:58 UTC (rev 35) @@ -96,15 +96,13 @@ DbEditorService dbEditorService = newService(DbEditorService.class); - DbEditorService.ResultDatas resultDatas = dbEditorService.getDatas( + datas = dbEditorService.getDatas( tableName, pager, sortColumn, ascendantOrder ); - datas = resultDatas.getRows(); - if (log.isInfoEnabled()) { log.info("Total page = " + getTotal()); } Modified: trunk/echobase-ui/src/main/resources/config/struts-dbeditor.xml =================================================================== --- trunk/echobase-ui/src/main/resources/config/struts-dbeditor.xml 2011-11-11 02:11:50 UTC (rev 34) +++ trunk/echobase-ui/src/main/resources/config/struts-dbeditor.xml 2011-11-11 02:13:58 UTC (rev 35) @@ -43,6 +43,12 @@ <result type="json"/> </action> + <action name="getForeignEntities" + class="fr.ifremer.echobase.ui.actions.dbeditor.GetForeignEntities"> + <interceptor-ref name="basicStackLoggued"/> + <result name="success">/WEB-INF/jsp/dbeditor/foreignEntities.jsp</result> + </action> + <action name="editTableData" class="fr.ifremer.echobase.ui.actions.dbeditor.SaveEntity"> <interceptor-ref name="basicStackLoggued"/> 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 2011-11-11 02:11:50 UTC (rev 34) +++ trunk/echobase-ui/src/main/resources/i18n/echobase-ui_fr_FR.properties 2011-11-11 02:13:58 UTC (rev 35) @@ -4,18 +4,19 @@ echobase.action.locale.english=Anglais echobase.action.locale.french=Français echobase.action.login=Connection -echobase.action.logout=Déconnection +echobase.action.logout=Déconnexion echobase.action.save=Sauvegarder echobase.common.admin=Administrateur echobase.common.comment=Commentaire echobase.common.email=Email echobase.common.import=Import configuration echobase.common.password=Mot de passe -echobase.common.survey=Campagne echobase.common.tableName=Nom de la table echobase.common.user=Utilisateur +echobase.common.voyage=Campagne echobase.error.bad.password=Mot de passe incorrrect echobase.error.email.already.used= +echobase.error.importArgument= echobase.error.login.unknown=Utilisateur inconnu echobase.error.required.email=L'email est obligatoire echobase.error.required.password=Le mot de passe est obligatoire @@ -36,7 +37,7 @@ echobase.label.language=Language echobase.label.locale.english=Anglais echobase.label.locale.french=Français -echobase.label.login=Connection +echobase.label.login=Connexion echobase.label.user.login=Utilisateur \: %s echobase.label.welcome=Bienvenue echobase.menu.export=Exports @@ -45,12 +46,12 @@ echobase.menu.users=Utilisateurs echobase.message.modified.property= echobase.msg.warnImportInProgress=Merci de ne pas fermer la fenêtre pour pouvoir acceder au résultats de l'import. -echobase.survey.selectHeader=Selectionnez une campagne echobase.title.dbEditor=Modification de la base echobase.title.export=Export echobase.title.import=Imports echobase.title.importProgress=Import en cours echobase.title.importResult=Résultats de l'import -echobase.title.login=Connection +echobase.title.login=Connexion echobase.title.users=Adminitration des utilisateurs echobase.user.gridTitle=Liste des utilisateurs +echobase.voyage.selectHeader=Selectionnez une campagne Modified: trunk/echobase-ui/src/main/webapp/WEB-INF/decorators.xml =================================================================== --- trunk/echobase-ui/src/main/webapp/WEB-INF/decorators.xml 2011-11-11 02:11:50 UTC (rev 34) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/decorators.xml 2011-11-11 02:13:58 UTC (rev 35) @@ -29,6 +29,7 @@ <pattern>/config-browser/*</pattern> <pattern>/user/login*</pattern> <pattern>/index*</pattern> + <pattern>/dbeditor/getForeignEntities*</pattern> </excludes> <decorator name="layout-default" page="layout-default.jsp"> Modified: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/dbeditor/dbeditor.jsp =================================================================== --- trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/dbeditor/dbeditor.jsp 2011-11-11 02:11:50 UTC (rev 34) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/dbeditor/dbeditor.jsp 2011-11-11 02:13:58 UTC (rev 35) @@ -35,11 +35,15 @@ jQuery(document).ready(function () { $('[name="tableName"]').change(function(event) { - var url = "${reloadUrl}?" + $.param({tableName:this.value}); window.location = url; }); }); + + function formatEntityLabel(cellvalue, options, rowObject) { + var columnName = options.colModel.name + "_lib"; + return rowObject[columnName]; + } </script> <div> @@ -60,6 +64,7 @@ <s:param name="tableName" value="%{tableName}"/> </s:url> + <sjg:grid id="tableDatas" caption="%{getText('echobase.common.tableDatas', tableNames[tableName])}" dataType="json" href="%{loadUrl}" gridModel="datas" @@ -73,18 +78,40 @@ editurl="%{editUrl}" rowList="10,15,20, 50" rowNum="10" + viewrecords="true" resizable="true" editinline="false" - navigatorSearchOptions="{multipleGroup:false,showQuery:true,multipleSearch:true,sopt:['eq','ne','cn','nc','bw','bn','ew','en','lt','le','gt','ge','nu','nn','in','ni']}" - > + navigatorSearchOptions="{multipleGroup:false,showQuery:true,multipleSearch:true,sopt:['eq','ne','cn','nc','bw','bn','ew','en','lt','le','gt','ge','nu','nn','in','ni']}"> <sjg:gridColumn name="id" title="id" hidden="true" editable="true"/> <s:iterator value="columnMetas" var="meta" status="status"> - <sjg:gridColumn name="%{#meta.name}" - title="%{getText(#meta.i18nKey)}" - sortable="true" editable="true" /> + <s:if test="#meta.fK"> + <s:set name="urlName">getForeignEntitiesUrl_<s:property value="%{#meta.typeSimpleName}"/></s:set> + <s:url id="urlName" + action="getForeignEntities" + namespace="/dbeditor" + escapeAmp="false"> + <s:param name="entityType" value="%{#meta.typeSimpleName}"/> + </s:url> + <sjg:gridColumn name="%{#meta.name}" + title="%{getText(#meta.i18nKey)}" + edittype='select' + editoptions="{dataUrl : '%{urlName}'}" + formatter='formatEntityLabel' + sortable="true" editable="true"/> + + </s:if> + <s:else> + <sjg:gridColumn name="%{#meta.name}" + title="%{getText(#meta.i18nKey)}" + edittype='%{getEditType(#meta)}' + formatter='%{getFormatter(#meta)}' + sortable="true" editable="true"/> + </s:else> + + </s:iterator> </sjg:grid> Added: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/dbeditor/foreignEntities.jsp =================================================================== --- trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/dbeditor/foreignEntities.jsp (rev 0) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/dbeditor/foreignEntities.jsp 2011-11-11 02:13:58 UTC (rev 35) @@ -0,0 +1,25 @@ +<%-- + #%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% + --%> +<%@ taglib prefix="s" uri="/struts-tags" %> +<s:select list="entities" theme="simple"/> \ No newline at end of file Property changes on: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/dbeditor/foreignEntities.jsp ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/import/import.jsp =================================================================== --- trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/import/import.jsp 2011-11-11 02:11:50 UTC (rev 34) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/import/import.jsp 2011-11-11 02:13:58 UTC (rev 35) @@ -26,31 +26,34 @@ <title><s:text name="echobase.title.import"/></title> -<s:form id="importForm" action="import" namespace="/import" method="POST" enctype="multipart/form-data"> +<s:form id="importForm" action="import" namespace="/import" method="POST" + enctype="multipart/form-data"> - <fieldset> - <legend> - <s:text name="echobase.common.import"/> - </legend> - <s:select - key="selectedSurvey" - label='%{getText("echobase.common.survey")}' - list="surveys" - emptyOption="true" - headerKey="-1" - headerValue='%{getText("echobase.survey.selectHeader")}' - /> + <fieldset> + <legend> + <s:text name="echobase.common.import"/> + </legend> + <s:select key="selectedVoyageId" + label='%{getText("echobase.common.voyage")}' + list="voyages" + emptyOption="true" + headerKey="-1" + headerValue='%{getText("echobase.voyage.selectHeader")}' /> - <s:file name="importModel.accessImport" key="echobase.importFile.access"/> - <s:file name="importModel.accousticImport" key="echobase.importFile.accoustique"/> - <s:file name="importModel.pecherieImport" key="echobase.importFile.pecherie"/> - <s:file name="importModel.lectureAgeGenImport" key="echobase.importFile.lectureAgeGen"/> - <s:file name="importModel.eventsImport" key="echobase.importFile.events"/> - <s:file name="importModel.typeEchoSpeciesImport" key="echobase.importFile.typeEchoSpecies"/> + <s:file name="importModel.accessImport" key="echobase.importFile.access"/> + <s:file name="importModel.accousticImport" + key="echobase.importFile.accoustique"/> + <s:file name="importModel.pecherieImport" + key="echobase.importFile.pecherie"/> + <s:file name="importModel.lectureAgeGenImport" + key="echobase.importFile.lectureAgeGen"/> + <s:file name="importModel.eventsImport" key="echobase.importFile.events"/> + <s:file name="importModel.typeEchoSpeciesImport" + key="echobase.importFile.typeEchoSpecies"/> - <s:textarea name="importModel.comment" key="echobase.common.comment"/> + <s:textarea name="importModel.comment" key="echobase.common.comment"/> - </fieldset> - <br/> - <s:submit id="addFilesSubmit" value='%{getText("echobase.action.import")}'/> + </fieldset> + <br/> + <s:submit id="addFilesSubmit" value='%{getText("echobase.action.import")}'/> </s:form> \ No newline at end of file