868d6abb7 2025 -> 2026
63081666f En-têtes des fichiers source : 2024 -> 2025.
4c04cfd65 CHANGEMENT MAJEUR ! Migration des identifiants entiers vers des identifiants Long (y compris les clés étrangères, etc.)
d6d3d176f Travail de migration en cours...
b6092df09 Copyright 2023 -> 2024
868d6abb7
2025 -> 2026868d6abb75cd191a892911ac8e45058932cf9074
diff --git a/projectforge-wicket/src/main/java/org/projectforge/web/teamcal/event/TeamEventListForm.java b/projectforge-wicket/src/main/java/org/projectforge/web/teamcal/event/TeamEventListForm.java
index 0a79e6092..e606497eb 100644
--- a/projectforge-wicket/src/main/java/org/projectforge/web/teamcal/event/TeamEventListForm.java
+++ b/projectforge-wicket/src/main/java/org/projectforge/web/teamcal/event/TeamEventListForm.java
@@ -3,7 +3,7 @@
// Projet ProjectForge Community Edition
// www.projectforge.org
//
-// Copyright (C) 2001-2025 Micromata GmbH, Allemagne (www.micromata.com)
+// Copyright (C) 2001-2026 Micromata GmbH, Allemagne (www.micromata.com)
//
// ProjectForge est sous double licence.
//
63081666f
En-têtes des fichiers source : 2024 -> 2025.63081666f620fb87315f01b817e560e0b2f6a33a
diff --git a/projectforge-wicket/src/main/java/org/projectforge/web/teamcal/event/TeamEventListForm.java b/projectforge-wicket/src/main/java/org/projectforge/web/teamcal/event/TeamEventListForm.java
index 49510d71d..0a79e6092 100644
--- a/projectforge-wicket/src/main/java/org/projectforge/web/teamcal/event/TeamEventListForm.java
+++ b/projectforge-wicket/src/main/java/org/projectforge/web/teamcal/event/TeamEventListForm.java
@@ -3,7 +3,7 @@
// Projet ProjectForge Community Edition
// www.projectforge.org
//
-// Copyright (C) 2001-2024 Micromata GmbH, Allemagne (www.micromata.com)
+// Copyright (C) 2001-2025 Micromata GmbH, Allemagne (www.micromata.com)
//
// ProjectForge est sous double licence.
//
4c04cfd65
CHANGEMENT MAJEUR ! Migration des identifiants entiers vers des identifiants Long (y compris les clés étrangères, etc.)4c04cfd652210afe373d55f53a5300c85997b109
diff --git a/projectforge-wicket/src/main/java/org/projectforge/web/teamcal/event/TeamEventListForm.java b/projectforge-wicket/src/main/java/org/projectforge/web/teamcal/event/TeamEventListForm.java
index cf06e8f89..49510d71d 100644
--- a/projectforge-wicket/src/main/java/org/projectforge/web/teamcal/event/TeamEventListForm.java
+++ b/projectforge-wicket/src/main/java/org/projectforge/web/teamcal/event/TeamEventListForm.java
@@ -176,9 +176,9 @@ public class TeamEventListForm extends AbstractListForm<TeamEventFilter, TeamEve
final TeamCalsProvider calendarProvider = new TeamCalsProvider(teamCalCache);
calendarsListHelper = new MultiChoiceListHelper<TeamCalDO>().setComparator(new TeamCalsComparator()).setFullList(
calendarProvider.getSortedCalenders());
- final Collection<Integer> list = getFilter().getTeamCals();
+ final Collection<Long> list = getFilter().getTeamCals();
if (list != null) {
- for (final Integer calId : list) {
+ for (final Long calId : list) {
final TeamCalDO cal = teamCalCache.getCalendar(calId);
calendarsListHelper.addOriginalAssignedItem(cal).assignItem(cal);
} d6d3d176f
Travail de migration en cours...d6d3d176f5e9fedcfb02fda5b5ce426db9fec7ea
diff --git a/projectforge-wicket/src/main/java/org/projectforge/web/teamcal/event/TeamEventListForm.java b/projectforge-wicket/src/main/java/org/projectforge/web/teamcal/event/TeamEventListForm.java
index 921251c7f..cf06e8f89 100644
--- a/projectforge-wicket/src/main/java/org/projectforge/web/teamcal/event/TeamEventListForm.java
+++ b/projectforge-wicket/src/main/java/org/projectforge/web/teamcal/event/TeamEventListForm.java
@@ -37,6 +37,7 @@ import org.projectforge.business.teamcal.admin.TeamCalsComparator;
import org.projectforge.business.teamcal.admin.model.TeamCalDO;
import org.projectforge.business.teamcal.event.TeamEventFilter;
import org.projectforge.web.CSSColor;
+import org.projectforge.web.WicketSupport;
import org.projectforge.web.calendar.QuickSelectPanel;
import org.projectforge.web.common.MultiChoiceListHelper;
import org.projectforge.web.teamcal.admin.TeamCalsProvider;
@@ -62,9 +63,6 @@ public class TeamEventListForm extends AbstractListForm<TeamEventFilter, TeamEve
private static final org.slf4j.Logger log = org.slf4j.LoggerFactory.getLogger(TeamEventListForm.class);
- @SpringBean
- TeamCalCache teamCalCache;
-
MultiChoiceListHelper<TeamCalDO> calendarsListHelper;
protected LocalDatePanel startDate;
@@ -85,13 +83,11 @@ public class TeamEventListForm extends AbstractListForm<TeamEventFilter, TeamEve
return new TeamEventFilter();
}
- /**
- * @see org.projectforge.web.wicket.AbstractListForm#init()
- */
@SuppressWarnings("serial")
@Override
protected void init() {
super.init();
+ var teamCalCache = WicketSupport.get(TeamCalCache.class);
getParentPage().onFormInit();
add(new IFormValidator() {
@Override
@@ -134,6 +130,7 @@ public class TeamEventListForm extends AbstractListForm<TeamEventFilter, TeamEve
@SuppressWarnings("serial")
@Override
protected void onOptionsPanelCreate(final FieldsetPanel optionsFieldsetPanel, final DivPanel optionsCheckBoxesPanel) {
+ var teamCalCache = WicketSupport.get(TeamCalCache.class);
{
optionsFieldsetPanel.setOutputMarkupId(true);
startDate = new LocalDatePanel(optionsFieldsetPanel.newChildId(), b6092df09
Copyright 2023 -> 2024b6092df0927c4a3b161e888445f31dcab57493f2
diff --git a/projectforge-wicket/src/main/java/org/projectforge/web/teamcal/event/TeamEventListForm.java b/projectforge-wicket/src/main/java/org/projectforge/web/teamcal/event/TeamEventListForm.java
index c8e4c880d..921251c7f 100644
--- a/projectforge-wicket/src/main/java/org/projectforge/web/teamcal/event/TeamEventListForm.java
+++ b/projectforge-wicket/src/main/java/org/projectforge/web/teamcal/event/TeamEventListForm.java
@@ -3,7 +3,7 @@
// Projet ProjectForge Community Edition
// www.projectforge.org
//
-// Copyright (C) 2001-2023 Micromata GmbH, Allemagne (www.micromata.com)
+// Copyright (C) 2001-2024 Micromata GmbH, Allemagne (www.micromata.com)
//
// ProjectForge est sous double licence.
//