868d6abb7 2025 -> 2026
63081666f En-têtes des fichiers source : 2024 -> 2025.
c193e8288 Ical4j : travaux de migration... (tous les tests OK)
d6d3d176f Travaux de migration en cours...
4efcbd0fb Travaux de migration en cours...
868d6abb7
2025 -> 2026868d6abb75cd191a892911ac8e45058932cf9074
diff --git a/projectforge-wicket/src/main/java/org/projectforge/web/teamcal/event/TeamEventEditForm.java b/projectforge-wicket/src/main/java/org/projectforge/web/teamcal/event/TeamEventEditForm.java
index 614025756..0168f22af 100644
--- a/projectforge-wicket/src/main/java/org/projectforge/web/teamcal/event/TeamEventEditForm.java
+++ b/projectforge-wicket/src/main/java/org/projectforge/web/teamcal/event/TeamEventEditForm.java
@@ -3,7 +3,7 @@
// Project ProjectForge Community Edition
// www.projectforge.org
//
-// Copyright (C) 2001-2025 Micromata GmbH, Germany (www.micromata.com)
+// Copyright (C) 2001-2026 Micromata GmbH, Germany (www.micromata.com)
//
// ProjectForge is dual-licensed.
//
63081666f
En-têtes des fichiers source : 2024 -> 2025.63081666f620fb87315f01b817e560e0b2f6a33a
diff --git a/projectforge-wicket/src/main/java/org/projectforge/web/teamcal/event/TeamEventEditForm.java b/projectforge-wicket/src/main/java/org/projectforge/web/teamcal/event/TeamEventEditForm.java
index ede894f18..614025756 100644
--- a/projectforge-wicket/src/main/java/org/projectforge/web/teamcal/event/TeamEventEditForm.java
+++ b/projectforge-wicket/src/main/java/org/projectforge/web/teamcal/event/TeamEventEditForm.java
@@ -3,7 +3,7 @@
// Project ProjectForge Community Edition
// www.projectforge.org
//
-// Copyright (C) 2001-2024 Micromata GmbH, Germany (www.micromata.com)
+// Copyright (C) 2001-2025 Micromata GmbH, Germany (www.micromata.com)
//
// ProjectForge is dual-licensed.
//
c193e8288
Ical4j : travaux de migration... (tous les tests OK)c193e8288c03be35a08171e2319957a6080381b9
diff --git a/projectforge-wicket/src/main/java/org/projectforge/web/teamcal/event/TeamEventEditForm.java b/projectforge-wicket/src/main/java/org/projectforge/web/teamcal/event/TeamEventEditForm.java
index 4fa3ecf10..ede894f18 100644
--- a/projectforge-wicket/src/main/java/org/projectforge/web/teamcal/event/TeamEventEditForm.java
+++ b/projectforge-wicket/src/main/java/org/projectforge/web/teamcal/event/TeamEventEditForm.java
@@ -34,7 +34,6 @@ import org.apache.wicket.markup.html.form.upload.FileUploadField;
import org.apache.wicket.markup.html.form.validation.IFormValidator;
import org.apache.wicket.model.Model;
import org.apache.wicket.model.PropertyModel;
-import org.apache.wicket.spring.injection.annot.SpringBean;
import org.projectforge.business.teamcal.admin.TeamCalDao;
import org.projectforge.business.teamcal.admin.model.TeamCalDO;
import org.projectforge.business.teamcal.event.*;
@@ -42,7 +41,6 @@ import org.projectforge.business.teamcal.event.model.TeamEventAttendeeDO;
import org.projectforge.business.teamcal.event.model.TeamEventDO;
import org.projectforge.business.teamcal.event.right.TeamEventRight;
import org.projectforge.business.utils.HtmlHelper;
-import org.projectforge.framework.access.AccessChecker;
import org.projectforge.framework.persistence.user.api.ThreadLocalUserContext;
import org.projectforge.framework.time.DateHelper;
import org.projectforge.framework.time.DateHolder;
d6d3d176f
Travaux de migration en cours...d6d3d176f5e9fedcfb02fda5b5ce426db9fec7ea
diff --git a/projectforge-wicket/src/main/java/org/projectforge/web/teamcal/event/TeamEventEditForm.java b/projectforge-wicket/src/main/java/org/projectforge/web/teamcal/event/TeamEventEditForm.java
index 80c226eef..4fa3ecf10 100644
--- a/projectforge-wicket/src/main/java/org/projectforge/web/teamcal/event/TeamEventEditForm.java
+++ b/projectforge-wicket/src/main/java/org/projectforge/web/teamcal/event/TeamEventEditForm.java
@@ -48,6 +48,7 @@ import org.projectforge.framework.time.DateHelper;
import org.projectforge.framework.time.DateHolder;
import org.projectforge.framework.time.DatePrecision;
import org.projectforge.framework.time.RecurrenceFrequency;
+import org.projectforge.web.WicketSupport;
import org.projectforge.web.common.MultiChoiceListHelper;
import org.projectforge.web.user.AttendeeWicketProvider;
import org.projectforge.web.wicket.AbstractEditForm;
@@ -74,18 +75,6 @@ public class TeamEventEditForm extends AbstractEditForm<TeamEventDO, TeamEventEd
private static final org.slf4j.Logger log = org.slf4j.LoggerFactory.getLogger(TeamEventEditForm.class);
- @SpringBean
- private transient TeamCalDao teamCalDao;
-
- @SpringBean
- private transient TeamEventDao teamEventDao;
-
- @SpringBean
- private transient AccessChecker accessChecker;
-
- @SpringBean
- private transient TeamEventService teamEventService;
-
private DateTimePanel startDateTimePanel;
private DateTimePanel endDateTimePanel;
@@ -142,14 +131,11 @@ public class TeamEventEditForm extends AbstractEditForm<TeamEventDO, TeamEventEd
right = new TeamEventRight();
}
- /**
- * @see org.projectforge.web.wicket.AbstractEditForm#init()
- */
- @SuppressWarnings("serial")
@Override
protected void init()
{
super.init();
+ var teamEventService = WicketSupport.get(TeamEventService.class);
recurrenceData = data.getRecurrenceData(ThreadLocalUserContext.getTimeZone());
@@ -199,7 +185,7 @@ public class TeamEventEditForm extends AbstractEditForm<TeamEventDO, TeamEventEd
@Override
protected List<String> getChoices(final String input)
{
- return teamEventDao.getLocationAutocompletion(input, calendarsWithFullAccess);
+ return WicketSupport.get(TeamEventDao.class).getLocationAutocompletion(input, calendarsWithFullAccess);
}
};
locationTextField.withMatchContains(true).withMinChars(3);
@@ -745,7 +731,7 @@ public class TeamEventEditForm extends AbstractEditForm<TeamEventDO, TeamEventEd
: "");
fieldSet.add(teamCalTitle); 4efcbd0fb
Travaux de migration en cours...4efcbd0fb62fb527758bd7d1834d604382c55b33
diff --git a/projectforge-wicket/src/main/java/org/projectforge/web/teamcal/event/TeamEventEditForm.java b/projectforge-wicket/src/main/java/org/projectforge/web/teamcal/event/TeamEventEditForm.java
index c84bba37c..80c226eef 100644
--- a/projectforge-wicket/src/main/java/org/projectforge/web/teamcal/event/TeamEventEditForm.java
+++ b/projectforge-wicket/src/main/java/org/projectforge/web/teamcal/event/TeamEventEditForm.java
@@ -139,7 +139,7 @@ public class TeamEventEditForm extends AbstractEditForm<TeamEventDO, TeamEventEd
public TeamEventEditForm(final TeamEventEditPage parentPage, final TeamEventDO data)
{
super(parentPage, data);
- right = new TeamEventRight(accessChecker);
+ right = new TeamEventRight();
}
/**