Author: tchemit Date: 2011-12-13 16:30:52 +0100 (Tue, 13 Dec 2011) New Revision: 177 Url: http://forge.codelutin.com/repositories/revision/echobase/177 Log: fix decorator fix foreign key name add tools test dir (only if present on FS) Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/DecoratorService.java trunk/echobase-tools/pom.xml trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/dbeditor/dbeditor.jsp Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/DecoratorService.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/DecoratorService.java 2011-12-13 15:28:43 UTC (rev 176) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/DecoratorService.java 2011-12-13 15:30:52 UTC (rev 177) @@ -258,7 +258,7 @@ registerJXPathDecorator(locale, MeasureType.class, "${name}$s"); // Mission decorator - registerJXPathDecorator(locale, Mission.class, "${missionName}$s"); + registerJXPathDecorator(locale, Mission.class, "${name}$s"); // Moment decorator registerJXPathDecorator(locale, Moment.class, "${name}$s"); Modified: trunk/echobase-tools/pom.xml =================================================================== --- trunk/echobase-tools/pom.xml 2011-12-13 15:28:43 UTC (rev 176) +++ trunk/echobase-tools/pom.xml 2011-12-13 15:30:52 UTC (rev 177) @@ -213,6 +213,26 @@ </plugins> </build> </profile> + + <profile> + <activation> + <file> + <exists>src/test/private/echobase</exists> + </file> + </activation> + <id>echobase-csv-inputs</id> + <build> + <testResources> + <testResource> + <directory>src/test/private/echobase</directory> + <includes> + <include>**/*.csv</include> + </includes> + </testResource> + </testResources> + </build> + </profile> + </profiles> </project> 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-12-13 15:28:43 UTC (rev 176) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/dbeditor/dbeditor.jsp 2011-12-13 15:30:52 UTC (rev 177) @@ -251,7 +251,7 @@ <s:if test="#meta.fK"> <sjg:gridColumn name="%{#meta.name}" - title="%{getText(#meta.i18nKey)}" + title="%{#meta.name}" formatter='formatEntityLabel' sortable="true"/> </s:if>