Mercurial > dive4elements > river
diff flys-artifacts/src/main/java/de/intevation/flys/artifacts/datacage/Recommendations.java @ 1018:d42fa223be48
Datacage: added first user specific config for cross sections.
flys-artifacts/trunk@2464 c6561f87-3c4e-4783-a992-168aeb5c3f6f
author | Sascha L. Teichmann <sascha.teichmann@intevation.de> |
---|---|
date | Thu, 04 Aug 2011 15:05:02 +0000 |
parents | 9a1a3080ad98 |
children | 930a9ce24294 |
line wrap: on
line diff
--- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/datacage/Recommendations.java Thu Aug 04 10:58:00 2011 +0000 +++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/datacage/Recommendations.java Thu Aug 04 15:05:02 2011 +0000 @@ -72,6 +72,7 @@ Map<String, Object> parameters ) { parameters.put("current-state-id", artifact.getCurrentStateId()); + parameters.put("artifact-id", artifact.identifier()); for (StateData sd: artifact.getAllData()) { Object value = sd.getValue(); @@ -139,9 +140,6 @@ new ArrayList<Builder.NamedConnection>(2); if (userId != null) { // system and user templates - connections.add(new Builder.NamedConnection( - Builder.CONNECTION_USER, systemConnection)); - // get connection to datacage db DataSource dataSource = DBConfig .getInstance() @@ -151,7 +149,10 @@ Connection userConnection = dataSource.getConnection(); try { connections.add(new Builder.NamedConnection( - Builder.CONNECTION_SYSTEM, userConnection, false)); + Builder.CONNECTION_USER, userConnection)); + + connections.add(new Builder.NamedConnection( + Builder.CONNECTION_SYSTEM, systemConnection, false)); userBuilder.build(connections, result, parameters); }