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 86b71a259b4c119c07d7bd4ae72009a02b6491d5..d1fcfcd9ea33972dbbe32967726f6755780dfbae 100644 (file)
--- 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">\r
                <property name="userAdminService" ref="userAdminService" />\r
                <property name="trackerService" ref="trackerService" />\r
+               <property name="activitiesService" ref="activitiesService" />\r
        </bean>\r
 \r
        <!-- Order is important -->\r

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 931e53e74a67047d37c27c6c5bbcb46a398876aa..39655065d427137e3556d4c6a4566a5a0f1f980c 100644 (file)
--- 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);
-
                                        }
                                }