Author: tchemit Date: 2011-11-25 13:14:20 +0100 (Fri, 25 Nov 2011) New Revision: 123 Url: http://forge.codelutin.com/repositories/revision/echobase/123 Log: -fix model rename user to modificationUser -fix modification message Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/DbEditorService.java trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/modificationLogs.jsp Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/DbEditorService.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/DbEditorService.java 2011-11-25 12:09:41 UTC (rev 122) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/DbEditorService.java 2011-11-25 12:14:20 UTC (rev 123) @@ -242,7 +242,7 @@ EchoBaseUser user) { TableMeta tableMeta = getTableMetas(entityType); DbEditorCsvModel<TopiaEntity> csvModel = buildForImport(tableMeta); - String messagePrefix = "Import du fichier " + importFileName; + String messagePrefix = "Import du fichier " + importFileName + " le " + newDate(); CsvImportResult result = new CsvImportResult(); result.setImportFileName(importFileName); @@ -421,12 +421,12 @@ targetValue = getDecoratorService().decorate( getLocale(), targetValue, null); } - buffer.append(String.format("\n Propriété '%s', ancienne valeur : %s, nouvelle valeur : %s", - propertyName, - sourceValue, - targetValue - )); } + buffer.append(String.format("\n Propriété '%s', ancienne valeur : %s, nouvelle valeur : %s", + propertyName, + sourceValue, + targetValue + )); } } Modified: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/modificationLogs.jsp =================================================================== --- trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/modificationLogs.jsp 2011-11-25 12:09:41 UTC (rev 122) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/modificationLogs.jsp 2011-11-25 12:14:20 UTC (rev 123) @@ -67,8 +67,8 @@ title="%{getText('echobase.common.modificationDate')}"/> <sjg:gridColumn name="modificationText" sortable="true" title="%{getText('echobase.common.modificationText')}"/> - <sjg:gridColumn name="user" sortable="true" formatter="formatEntityLabel" - title="%{getText('echobase.common.user')}"/> + <sjg:gridColumn name="modificationUser" sortable="true" formatter="formatEntityLabel" + title="%{getText('echobase.common.modificationUser')}"/> </sjg:grid> <br/>