Author: tchemit Date: 2011-11-25 12:51:24 +0100 (Fri, 25 Nov 2011) New Revision: 121 Url: http://forge.codelutin.com/repositories/revision/echobase/121 Log: - fix sql export - fix submit value Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/ExportSqlCsvModel.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/ExportSqlService.java trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/export/ManageExportQuery.java trunk/echobase-ui/src/main/resources/i18n/echobase-ui_fr_FR.properties trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/export/exportSqlResult.jsp Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/ExportSqlCsvModel.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/ExportSqlCsvModel.java 2011-11-25 09:36:01 UTC (rev 120) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/ExportSqlCsvModel.java 2011-11-25 11:51:24 UTC (rev 121) @@ -51,7 +51,8 @@ for (String columnHeader : columnHeaders) { modelBuilder.newColumnForExport( columnHeader, - columnHeader + columnHeader, + CsvModelUtil.TO_STRING_FORMATTER ); } } Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/ExportSqlService.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/ExportSqlService.java 2011-11-25 09:36:01 UTC (rev 120) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/ExportSqlService.java 2011-11-25 11:51:24 UTC (rev 121) @@ -39,6 +39,7 @@ import java.sql.Connection; import java.sql.PreparedStatement; import java.sql.ResultSet; +import java.sql.ResultSetMetaData; import java.sql.SQLException; import java.util.List; import java.util.Map; Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/export/ManageExportQuery.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/export/ManageExportQuery.java 2011-11-25 09:36:01 UTC (rev 120) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/export/ManageExportQuery.java 2011-11-25 11:51:24 UTC (rev 121) @@ -107,18 +107,19 @@ if (sqlQueries.isEmpty()) { // no query saved addActionMessage(_("echobase.info.no.sqlQuery.saved")); - } + } else { - String selectedQueryId = getQuery().getTopiaId(); + String selectedQueryId = getQuery().getTopiaId(); - if (StringUtils.isEmpty(selectedQueryId)) { + if (StringUtils.isEmpty(selectedQueryId)) { - // no query selected - addActionMessage(_("echobase.info.no.sqlQuery.selected")); - } else { + // no query selected + addActionMessage(_("echobase.info.no.sqlQuery.selected")); + } else { - // load query from database - query = service.getEntityById(ExportQuery.class, selectedQueryId); + // load query from database + query = service.getEntityById(ExportQuery.class, selectedQueryId); + } } } } \ 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 2011-11-25 09:36:01 UTC (rev 120) +++ trunk/echobase-ui/src/main/resources/i18n/echobase-ui_fr_FR.properties 2011-11-25 11:51:24 UTC (rev 121) @@ -52,7 +52,7 @@ echobase.header.user.gridTitle=Liste des utilisateurs echobase.header.voyageSelect=Selectionnez une campagne echobase.info.dbeditor.propertyDiffsResult=Résultat d'import de données -echobase.info.no.sqlQuery.saved=Aucune requête d'export sql enregistré +echobase.info.no.sqlQuery.saved=Aucune requête d'export sql enregistrée 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.label.createIfNotFound=Créer les entités non trouvées en base Modified: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/export/exportSqlResult.jsp =================================================================== --- trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/export/exportSqlResult.jsp 2011-11-25 09:36:01 UTC (rev 120) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/export/exportSqlResult.jsp 2011-11-25 11:51:24 UTC (rev 121) @@ -45,7 +45,7 @@ <s:hidden key="sql" label=""/> <s:textfield key="fileName" required="true" size="100" label="%{getText('echobase.label.exportFileName')}"/> - <s:submit key="echobase.action.exportSqlData" align="left"/> + <s:submit value="%{getText('echobase.action.exportSqlData')}" align="left"/> <br/> <sjg:grid id="rows" caption="%{getText('echobase.header.request.result')}" dataType="json" href="%{loadUrl}" gridModel="datas"