Author: tchemit Date: 2011-11-13 23:46:01 +0100 (Sun, 13 Nov 2011) New Revision: 57 Url: http://forge.codelutin.com/repositories/revision/echobase/57 Log: use decorated entity in db editor Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/DbEditorService.java 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-13 22:45:29 UTC (rev 56) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/DbEditorService.java 2011-11-13 22:46:01 UTC (rev 57) @@ -205,10 +205,25 @@ } for (int i = 0; i < length; i++) { PropertyDiff diff = propertyDiffs[i]; + + Object sourceValue = diff.getSourceValue(); + Object targetValue = diff.getTargetValue(); + + String propertyName = diff.getSourceProperty(); + + if (tableMeta.getColumns(propertyName).isFK()) { + + // replace by the decorate value + sourceValue = getDecoratorService().decorate( + getLocale(), sourceValue, null); + targetValue = getDecoratorService().decorate( + getLocale(), targetValue, null); + + } buffer.append(String.format("\n Propriété '%s', ancienne valeur : %s, nouvelle valeur : %s", - diff.getSourceProperty(), - diff.getSourceValue(), - diff.getTargetValue() + propertyName, + sourceValue, + targetValue )); } dao1.create(