868d6abb7 2025 -> 2026
63081666f Заголовки исходных файлов: 2024-> 2025.
db2599ab8 История в книге заказов, входящих/исходящих счетах и проектах.
8c0b82f21 Удалены неиспользуемые импорты.
d6d3d176f Миграция в процессе...
868d6abb7
2025 -> 2026868d6abb75cd191a892911ac8e45058932cf9074
diff --git a/projectforge-wicket/src/main/java/org/projectforge/web/fibu/ProjektListPage.java b/projectforge-wicket/src/main/java/org/projectforge/web/fibu/ProjektListPage.java
index f9408cfab..3e3c7fe36 100644
--- a/projectforge-wicket/src/main/java/org/projectforge/web/fibu/ProjektListPage.java
+++ b/projectforge-wicket/src/main/java/org/projectforge/web/fibu/ProjektListPage.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/fibu/ProjektListPage.java b/projectforge-wicket/src/main/java/org/projectforge/web/fibu/ProjektListPage.java
index 4d6d409fc..f9408cfab 100644
--- a/projectforge-wicket/src/main/java/org/projectforge/web/fibu/ProjektListPage.java
+++ b/projectforge-wicket/src/main/java/org/projectforge/web/fibu/ProjektListPage.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.
//
db2599ab8
История в книге заказов, входящих/исходящих счетах и проектах.db2599ab88a347e0ff9ad66a479f9b14577a17e2
diff --git a/projectforge-wicket/src/main/java/org/projectforge/web/fibu/ProjektListPage.java b/projectforge-wicket/src/main/java/org/projectforge/web/fibu/ProjektListPage.java
index c1e4f4079..4d6d409fc 100644
--- a/projectforge-wicket/src/main/java/org/projectforge/web/fibu/ProjektListPage.java
+++ b/projectforge-wicket/src/main/java/org/projectforge/web/fibu/ProjektListPage.java
@@ -180,7 +180,7 @@ public class ProjektListPage extends AbstractListPage<ProjektListForm, ProjektDa
{
final ProjektDO projektDO = rowModel.getObject();
final ProjektImpl projekt = new ProjektImpl(projektDO);
- final List<Kost2Art> kost2Arts = WicketSupport.get(KostCache.class).getAllKost2Arts(projektDO.getId());
+ final List<Kost2Art> kost2Arts = WicketSupport.get(KostCache.class).getAllKost2ArtsForProjekt(projektDO.getId());
projekt.setKost2Arts(kost2Arts);
final Label label = new Label(componentId, new Model<String>(projekt.getKost2ArtsAsHtml()));
label.setEscapeModelStrings(false); 8c0b82f21
Удалены неиспользуемые импорты.8c0b82f212543f1da4a56ab523e8e599850e8338
diff --git a/projectforge-wicket/src/main/java/org/projectforge/web/fibu/ProjektListPage.java b/projectforge-wicket/src/main/java/org/projectforge/web/fibu/ProjektListPage.java
index 809958ef6..c1e4f4079 100644
--- a/projectforge-wicket/src/main/java/org/projectforge/web/fibu/ProjektListPage.java
+++ b/projectforge-wicket/src/main/java/org/projectforge/web/fibu/ProjektListPage.java
@@ -33,7 +33,6 @@ import org.apache.wicket.markup.repeater.Item;
import org.apache.wicket.model.IModel;
import org.apache.wicket.model.Model;
import org.apache.wicket.request.mapper.parameter.PageParameters;
-import org.apache.wicket.spring.injection.annot.SpringBean;
import org.projectforge.business.fibu.KontoCache;
import org.projectforge.business.fibu.KontoDO;
import org.projectforge.business.fibu.ProjektDO;
d6d3d176f
Миграция в процессе...d6d3d176f5e9fedcfb02fda5b5ce426db9fec7ea
diff --git a/projectforge-wicket/src/main/java/org/projectforge/web/fibu/ProjektListPage.java b/projectforge-wicket/src/main/java/org/projectforge/web/fibu/ProjektListPage.java
index 3275bf571..809958ef6 100644
--- a/projectforge-wicket/src/main/java/org/projectforge/web/fibu/ProjektListPage.java
+++ b/projectforge-wicket/src/main/java/org/projectforge/web/fibu/ProjektListPage.java
@@ -44,6 +44,7 @@ import org.projectforge.framework.persistence.user.api.UserPrefArea;
import org.projectforge.framework.persistence.user.entities.GroupDO;
import org.projectforge.reporting.Kost2Art;
import org.projectforge.reporting.impl.ProjektImpl;
+import org.projectforge.web.WicketSupport;
import org.projectforge.web.task.TaskPropertyColumn;
import org.projectforge.web.user.UserPrefListPage;
import org.projectforge.web.wicket.*;
@@ -58,18 +59,6 @@ public class ProjektListPage extends AbstractListPage<ProjektListForm, ProjektDa
{
private static final long serialVersionUID = -8406452960003792763L;
- @SpringBean
- private ProjektDao projektDao;
-
- @SpringBean
- private KontoCache kontoCache;
-
- @SpringBean
- private KostCache kostCache;
-
- @SpringBean
- private GroupService groupService;
-
public ProjektListPage(final PageParameters parameters)
{
super(parameters, "fibu.projekt");
@@ -168,7 +157,7 @@ public class ProjektListPage extends AbstractListPage<ProjektListForm, ProjektDa
final ProjektDO projektDO = rowModel.getObject();
String groupName = "";
if (projektDO.getProjektManagerGroupId() != null) {
- final GroupDO group = groupService.getGroup(projektDO.getProjektManagerGroupId());
+ final GroupDO group = WicketSupport.get(GroupService.class).getGroup(projektDO.getProjektManagerGroupId());
if (group != null) {
groupName = group.getName();
}
@@ -192,7 +181,7 @@ public class ProjektListPage extends AbstractListPage<ProjektListForm, ProjektDa
{
final ProjektDO projektDO = rowModel.getObject();
final ProjektImpl projekt = new ProjektImpl(projektDO);
- final List<Kost2Art> kost2Arts = kostCache.getAllKost2Arts(projektDO.getId());
+ final List<Kost2Art> kost2Arts = WicketSupport.get(KostCache.class).getAllKost2Arts(projektDO.getId());
projekt.setKost2Arts(kost2Arts);
final Label label = new Label(componentId, new Model<String>(projekt.getKost2ArtsAsHtml()));
label.setEscapeModelStrings(false);
@@ -204,7 +193,7 @@ public class ProjektListPage extends AbstractListPage<ProjektListForm, ProjektDa
getSortable("description",
sortable),
"description", cellItemListener));
- if (kontoCache.isEmpty() == false) {
+ if (WicketSupport.get(KontoCache.class).isEmpty() == false) {
columns
.add(new CellItemListenerPropertyColumn<ProjektDO>(new Model<String>(getString("fibu.konto")), null, "konto",
cellItemListener)
@@ -218,7 +207,7 @@ public class ProjektListPage extends AbstractListPage<ProjektListForm, ProjektDa