868d6abb7 2025 -> 2026
63081666f Заголовки исходных файлов: 2024 -> 2025.
4c04cfd65 КРУПНОЕ ИЗМЕНЕНИЕ! Миграция целочисленных id на Long id (включая внешние ключи и т.д.)
d6d3d176f Миграция в процессе...
b6092df09 Авторские права 2023 -> 2024
868d6abb7
2025 -> 2026868d6abb75cd191a892911ac8e45058932cf9074
diff --git a/projectforge-wicket/src/main/java/org/projectforge/web/teamcal/event/importics/TeamCalImportForm.java b/projectforge-wicket/src/main/java/org/projectforge/web/teamcal/event/importics/TeamCalImportForm.java
index 7bc548973..a5e234712 100644
--- a/projectforge-wicket/src/main/java/org/projectforge/web/teamcal/event/importics/TeamCalImportForm.java
+++ b/projectforge-wicket/src/main/java/org/projectforge/web/teamcal/event/importics/TeamCalImportForm.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
Заголовки исходных файлов: 2024 -> 2025.63081666f620fb87315f01b817e560e0b2f6a33a
diff --git a/projectforge-wicket/src/main/java/org/projectforge/web/teamcal/event/importics/TeamCalImportForm.java b/projectforge-wicket/src/main/java/org/projectforge/web/teamcal/event/importics/TeamCalImportForm.java
index bc2243f8a..7bc548973 100644
--- a/projectforge-wicket/src/main/java/org/projectforge/web/teamcal/event/importics/TeamCalImportForm.java
+++ b/projectforge-wicket/src/main/java/org/projectforge/web/teamcal/event/importics/TeamCalImportForm.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.
//
4c04cfd65
КРУПНОЕ ИЗМЕНЕНИЕ! Миграция целочисленных id на Long id (включая внешние ключи и т.д.)4c04cfd652210afe373d55f53a5300c85997b109
diff --git a/projectforge-wicket/src/main/java/org/projectforge/web/teamcal/event/importics/TeamCalImportForm.java b/projectforge-wicket/src/main/java/org/projectforge/web/teamcal/event/importics/TeamCalImportForm.java
index 60b4929fb..bc2243f8a 100644
--- a/projectforge-wicket/src/main/java/org/projectforge/web/teamcal/event/importics/TeamCalImportForm.java
+++ b/projectforge-wicket/src/main/java/org/projectforge/web/teamcal/event/importics/TeamCalImportForm.java
@@ -112,7 +112,7 @@ public class TeamCalImportForm extends AbstractImportForm<ImportFilter, TeamCalI
panel.add(storagePanel);
}
- protected Integer getCalendarId()
+ protected Long getCalendarId()
{
return calendar != null ? calendar.getId() : null;
} d6d3d176f
Миграция в процессе...d6d3d176f5e9fedcfb02fda5b5ce426db9fec7ea
diff --git a/projectforge-wicket/src/main/java/org/projectforge/web/teamcal/event/importics/TeamCalImportForm.java b/projectforge-wicket/src/main/java/org/projectforge/web/teamcal/event/importics/TeamCalImportForm.java
index 9ef1c26cc..60b4929fb 100644
--- a/projectforge-wicket/src/main/java/org/projectforge/web/teamcal/event/importics/TeamCalImportForm.java
+++ b/projectforge-wicket/src/main/java/org/projectforge/web/teamcal/event/importics/TeamCalImportForm.java
@@ -32,6 +32,7 @@ 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.web.WicketSupport;
import org.projectforge.web.core.importstorage.AbstractImportForm;
import org.projectforge.web.core.importstorage.ImportFilter;
import org.projectforge.web.wicket.components.LabelValueChoiceRenderer;
@@ -52,9 +53,6 @@ public class TeamCalImportForm extends AbstractImportForm<ImportFilter, TeamCalI
// private ModalDialog modalDialog;
- @SpringBean
- private TeamCalDao teamCalDao;
-
public TeamCalImportForm(final TeamCalImportPage parentPage)
{
super(parentPage);
@@ -71,7 +69,7 @@ public class TeamCalImportForm extends AbstractImportForm<ImportFilter, TeamCalI
gridBuilder.newGridPanel();
{
final FieldsetPanel fs = gridBuilder.newFieldset(getString("plugins.teamcal.event.teamCal"));
- final List<TeamCalDO> list = teamCalDao.getAllCalendarsWithFullAccess();
+ final List<TeamCalDO> list = WicketSupport.get(TeamCalDao.class).getAllCalendarsWithFullAccess();
final LabelValueChoiceRenderer<TeamCalDO> calChoiceRenderer = new LabelValueChoiceRenderer<TeamCalDO>();
for (final TeamCalDO cal : list) {
calChoiceRenderer.addValue(cal, cal.getTitle()); b6092df09
Авторские права 2023 -> 2024b6092df0927c4a3b161e888445f31dcab57493f2
diff --git a/projectforge-wicket/src/main/java/org/projectforge/web/teamcal/event/importics/TeamCalImportForm.java b/projectforge-wicket/src/main/java/org/projectforge/web/teamcal/event/importics/TeamCalImportForm.java
index 19a14819e..9ef1c26cc 100644
--- a/projectforge-wicket/src/main/java/org/projectforge/web/teamcal/event/importics/TeamCalImportForm.java
+++ b/projectforge-wicket/src/main/java/org/projectforge/web/teamcal/event/importics/TeamCalImportForm.java
@@ -3,7 +3,7 @@
// Project ProjectForge Community Edition
// www.projectforge.org
//
-// Copyright (C) 2001-2023 Micromata GmbH, Germany (www.micromata.com)
+// Copyright (C) 2001-2024 Micromata GmbH, Germany (www.micromata.com)
//
// ProjectForge is dual-licensed.
//