From: bsinou <bsinou@argeo.org>
Date: Thu, 6 Apr 2017 14:12:15 +0000 (+0200)
Subject: Adapt after bug fixes
X-Git-Tag: argeo-suite-0.1.9~11
X-Git-Url: https://git.argeo.org/?p=gpl%2Fargeo-suite.git;a=commitdiff_plain;h=294a3c05c54676ce508e5e6d1f7d26fb4701e675

Adapt after bug fixes
---

diff --git a/org.argeo.suite.apps/META-INF/spring/workbench-services.xml b/org.argeo.suite.apps/META-INF/spring/workbench-services.xml
index 86b71a2..d1fcfcd 100644
--- a/org.argeo.suite.apps/META-INF/spring/workbench-services.xml
+++ b/org.argeo.suite.apps/META-INF/spring/workbench-services.xml
@@ -22,6 +22,7 @@
 	<bean id="trackerWorkbenchService" class="org.argeo.tracker.workbench.TrackerWorkbenchService">
 		<property name="userAdminService" ref="userAdminService" />
 		<property name="trackerService" ref="trackerService" />
+		<property name="activitiesService" ref="activitiesService" />
 	</bean>
 
 	<!-- Order is important -->
diff --git a/org.argeo.suite.workbench.rap/src/org/argeo/suite/workbench/commands/ImportEntities.java b/org.argeo.suite.workbench.rap/src/org/argeo/suite/workbench/commands/ImportEntities.java
index 931e53e..3965506 100644
--- a/org.argeo.suite.workbench.rap/src/org/argeo/suite/workbench/commands/ImportEntities.java
+++ b/org.argeo.suite.workbench.rap/src/org/argeo/suite/workbench/commands/ImportEntities.java
@@ -518,7 +518,6 @@ public class ImportEntities extends AbstractHandler implements PeopleNames {
 						PeopleJcrUtils.createContact(resourcesService, peopleService, tmpPerson,
 								PeopleTypes.PEOPLE_MAIL, value, false, ContactValueCatalogs.CONTACT_CAT_MAIN,
 								null);
-
 					}
 				}