Author: tchemit Date: 2011-11-26 12:02:53 +0100 (Sat, 26 Nov 2011) New Revision: 133 Url: http://forge.codelutin.com/repositories/revision/echobase/133 Log: fix import data Modified: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/configureFiles.jsp trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/importResult.jsp Modified: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/configureFiles.jsp =================================================================== --- trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/configureFiles.jsp 2011-11-26 10:50:09 UTC (rev 132) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/configureFiles.jsp 2011-11-26 11:02:53 UTC (rev 133) @@ -45,7 +45,7 @@ <s:text name="echobase.legend.import.configuration.files"/> </legend> - <s:hidden key="voyageId" label=''/> + <s:hidden key="missionId" label=''/> <s:file name="acoustic" key="echobase.label.import.accoustique"/> Modified: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/importResult.jsp =================================================================== --- trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/importResult.jsp 2011-11-26 10:50:09 UTC (rev 132) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/importResult.jsp 2011-11-26 11:02:53 UTC (rev 133) @@ -26,13 +26,25 @@ <title><s:text name="echobase.title.importResult"/></title> +<fieldset> + <legend> + <s:text name="echobase.legend.import.configuration.mission.resume"/> + </legend> + <s:label value="%{model.mission.missionName}" + key='echobase.common.missionName'/> + + <s:label value="%{model.mission.missionAbstract}" + key='echobase.common.missionAbstract'/> +</fieldset> +<br/> <s:iterator value="importResult" var="entry"> <s:set var="inputFile" value="%{#entry.key}"/> <s:set var="result" value="%{#entry.value}"/> <fieldset> <legend> <s:text name="echobase.legend.importFileResult"> - <s:param><strong><s:property value="%{#inputFile.label}"/></strong></s:param> + <s:param><strong><s:property + value="%{#inputFile.label}"/></strong></s:param> </s:text> </legend>