Author: tchemit Date: 2012-01-06 17:19:28 +0100 (Fri, 06 Jan 2012) New Revision: 244 Url: http://forge.codelutin.com/repositories/revision/echobase/244 Log: fix dbeditor little bugs clean struts mapping files begin of implementation of import datas Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/dbeditor/AbstractLoadPage.java trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/dbeditor/ExportTable.java trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/dbeditor/SaveEntity.java trunk/echobase-ui/src/main/resources/config/struts-dbeditor.xml trunk/echobase-ui/src/main/resources/config/struts-embeddedApplication.xml trunk/echobase-ui/src/main/resources/config/struts-exportDb.xml trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/dbeditor/dbeditor.jsp trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/configureFiles.jsp trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/configureMission.jsp Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/dbeditor/AbstractLoadPage.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/dbeditor/AbstractLoadPage.java 2012-01-06 16:18:37 UTC (rev 243) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/dbeditor/AbstractLoadPage.java 2012-01-06 16:19:28 UTC (rev 244) @@ -74,8 +74,12 @@ entityTypes = Maps.newTreeMap(); DbMeta dbMeta = getEchoBaseApplicationContext().getDbMeta(); for (TableMeta tableMeta : dbMeta) { - String name = tableMeta.getName(); - entityTypes.put(name, name); + + // keep only editable metas + if (dbMeta.isEditable(tableMeta)) { + String name = tableMeta.getName(); + entityTypes.put(name, name); + } } if (entityType == null) { Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/dbeditor/ExportTable.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/dbeditor/ExportTable.java 2012-01-06 16:18:37 UTC (rev 243) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/dbeditor/ExportTable.java 2012-01-06 16:19:28 UTC (rev 244) @@ -96,7 +96,8 @@ if (log.isDebugEnabled()) { log.debug("file to export " + content); } - contentLength = content.length(); + //FIXME tchemit 2012-01-05 : use the double size to be sure to have the correct length :( find out which caracters are not unicode aware in baracouda datas + contentLength = content.length() * 2; contentType = "text/csv"; inputStream = new ByteArrayInputStream(content.getBytes()); return SUCCESS; Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/dbeditor/SaveEntity.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/dbeditor/SaveEntity.java 2012-01-06 16:18:37 UTC (rev 243) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/dbeditor/SaveEntity.java 2012-01-06 16:19:28 UTC (rev 244) @@ -28,7 +28,6 @@ import fr.ifremer.echobase.entities.meta.TableMeta; import fr.ifremer.echobase.services.DbEditorService; import fr.ifremer.echobase.ui.actions.EchoBaseActionSupport; -import org.apache.commons.lang3.StringUtils; import org.apache.struts2.interceptor.ParameterAware; import org.nuiton.topia.persistence.TopiaEntity; @@ -85,11 +84,9 @@ // take only the first value String propertyValue = values[0]; - if (StringUtils.isNotEmpty(propertyValue)) { - // only keep properties with no empty value - properties.put(columnName, propertyValue); - } + // only keep properties with no empty value + properties.put(columnName, propertyValue); } } } Modified: trunk/echobase-ui/src/main/resources/config/struts-dbeditor.xml =================================================================== --- trunk/echobase-ui/src/main/resources/config/struts-dbeditor.xml 2012-01-06 16:18:37 UTC (rev 243) +++ trunk/echobase-ui/src/main/resources/config/struts-dbeditor.xml 2012-01-06 16:19:28 UTC (rev 244) @@ -41,14 +41,14 @@ </result-type> </result-types> - <!-- load db editor main page --> + <!-- Load db editor main page --> <action name="dbeditor" method="input" class="fr.ifremer.echobase.ui.actions.dbeditor.LoadEntities"> <interceptor-ref name="paramsPrepareParamsStackLoggued"/> <result name="input">/WEB-INF/jsp/dbeditor/dbeditor.jsp</result> </action> - <!-- get foreign entities as a select box --> + <!-- Get foreign entities as a select box --> <action name="getForeignEntities" class="fr.ifremer.echobase.ui.actions.dbeditor.GetForeignEntities"> <result type="json"/> @@ -73,10 +73,12 @@ </action> <!-- Import some entities from a csv file --> - <action name="doImport" class="fr.ifremer.echobase.ui.actions.dbeditor.ImportTable"> + <action name="doImport" + class="fr.ifremer.echobase.ui.actions.dbeditor.ImportTable"> <interceptor-ref name="paramsPrepareParamsStackLoggued"/> <result>/WEB-INF/jsp/dbeditor/csvImportResult.jsp</result> <result name="input">/WEB-INF/jsp/dbeditor/dbeditor.jsp</result> + <result name="error">/WEB-INF/jsp/dbeditor/dbeditor.jsp</result> </action> <!-- Export a selected entity type to a csv file --> Modified: trunk/echobase-ui/src/main/resources/config/struts-embeddedApplication.xml =================================================================== --- trunk/echobase-ui/src/main/resources/config/struts-embeddedApplication.xml 2012-01-06 16:18:37 UTC (rev 243) +++ trunk/echobase-ui/src/main/resources/config/struts-embeddedApplication.xml 2012-01-06 16:19:28 UTC (rev 244) @@ -32,7 +32,7 @@ <package name="embeddedApplication" extends="loggued" namespace="/embeddedApplication"> - <!-- Configure --> + <!-- Configure embedded application archive --> <action name="configure" class="fr.ifremer.echobase.ui.actions.embeddedApplication.Configure"> <interceptor-ref name="paramsPrepareParamsStackLoggued"/> @@ -45,7 +45,7 @@ </result> </action> - <!-- Starts creation of the embedded application archive --> + <!-- Build embedded application archive --> <action name="build" class="fr.ifremer.echobase.ui.actions.embeddedApplication.Build" method="execute"> @@ -55,7 +55,7 @@ <result>/WEB-INF/jsp/embeddedApplication/result.jsp</result> </action> - <!-- Download the embedded application archive --> + <!-- Download embedded application archive --> <action name="download" class="fr.ifremer.echobase.ui.actions.embeddedApplication.Download"> <interceptor-ref name="paramsPrepareParamsStackLoggued"/> Modified: trunk/echobase-ui/src/main/resources/config/struts-exportDb.xml =================================================================== --- trunk/echobase-ui/src/main/resources/config/struts-exportDb.xml 2012-01-06 16:18:37 UTC (rev 243) +++ trunk/echobase-ui/src/main/resources/config/struts-exportDb.xml 2012-01-06 16:19:28 UTC (rev 244) @@ -41,7 +41,7 @@ </result> </action> - <!-- Starts export --> + <!-- Build export --> <action name="export" class="fr.ifremer.echobase.ui.actions.exportDb.Export" method="execute"> @@ -51,7 +51,7 @@ <result>/WEB-INF/jsp/exportDb/result.jsp</result> </action> - <!-- Download the export --> + <!-- Download export --> <action name="download" class="fr.ifremer.echobase.ui.actions.exportDb.Download"> <interceptor-ref name="paramsPrepareParamsStackLoggued"/> 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 2012-01-06 16:18:37 UTC (rev 243) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/dbeditor/dbeditor.jsp 2012-01-06 16:19:28 UTC (rev 244) @@ -91,7 +91,7 @@ $.each(result.datas, function(propertyName, value) { - if (propertyName == 'id') { + if (propertyName == 'topiaId') { // push the id of row $("#" + propertyName).val(value); 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 2012-01-06 16:18:37 UTC (rev 243) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/configureFiles.jsp 2012-01-06 16:19:28 UTC (rev 244) @@ -57,8 +57,8 @@ <legend> <s:text name="echobase.legend.importData.configuration.mission.resume"/> </legend> - <s:label value="%{model.mission.missionName}" - key='echobase.common.missionName'/> + <s:label value="%{model.mission.name}" + key='echobase.common.name'/> <s:label value="%{model.mission.missionAbstract}" key='echobase.common.missionAbstract'/> Modified: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/configureMission.jsp =================================================================== --- trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/configureMission.jsp 2012-01-06 16:18:37 UTC (rev 243) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/configureMission.jsp 2012-01-06 16:19:28 UTC (rev 244) @@ -97,8 +97,8 @@ String PROPERTY_SOURCE = "source"; --%> - <s:textfield key="mission.missionName" size="40" required="true" - label='%{getText("echobase.common.missionName")}'/> + <s:textfield key="mission.name" size="40" required="true" + label='%{getText("echobase.common.name")}'/> <s:textfield key="mission.missionAbstract" size="40" required="true" label='%{getText("echobase.common.missionAbstract")}'/>