868d6abb7 2025 -> 2026
63081666f Encabezados de archivos fuente: 2024 -> 2025.
8c0b82f21 Importaciones no utilizadas eliminadas.
4efcbd0fb Migración en curso...
b6092df09 Copyright 2023 -> 2024
868d6abb7
2025 -> 2026868d6abb75cd191a892911ac8e45058932cf9074
diff --git a/projectforge-wicket/src/main/java/org/projectforge/web/user/GroupEditForm.java b/projectforge-wicket/src/main/java/org/projectforge/web/user/GroupEditForm.java
index d6e1c2b48..de7e3b90f 100644
--- a/projectforge-wicket/src/main/java/org/projectforge/web/user/GroupEditForm.java
+++ b/projectforge-wicket/src/main/java/org/projectforge/web/user/GroupEditForm.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
Encabezados de archivos fuente: 2024 -> 2025.63081666f620fb87315f01b817e560e0b2f6a33a
diff --git a/projectforge-wicket/src/main/java/org/projectforge/web/user/GroupEditForm.java b/projectforge-wicket/src/main/java/org/projectforge/web/user/GroupEditForm.java
index 496716389..d6e1c2b48 100644
--- a/projectforge-wicket/src/main/java/org/projectforge/web/user/GroupEditForm.java
+++ b/projectforge-wicket/src/main/java/org/projectforge/web/user/GroupEditForm.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.
//
8c0b82f21
Importaciones no utilizadas eliminadas.8c0b82f212543f1da4a56ab523e8e599850e8338
diff --git a/projectforge-wicket/src/main/java/org/projectforge/web/user/GroupEditForm.java b/projectforge-wicket/src/main/java/org/projectforge/web/user/GroupEditForm.java
index faf770e95..496716389 100644
--- a/projectforge-wicket/src/main/java/org/projectforge/web/user/GroupEditForm.java
+++ b/projectforge-wicket/src/main/java/org/projectforge/web/user/GroupEditForm.java
@@ -31,7 +31,6 @@ import org.apache.wicket.markup.html.form.Form;
import org.apache.wicket.markup.html.form.FormComponent;
import org.apache.wicket.markup.html.form.validation.IFormValidator;
import org.apache.wicket.model.PropertyModel;
-import org.apache.wicket.spring.injection.annot.SpringBean;
import org.apache.wicket.validation.IValidator;
import org.apache.wicket.validation.ValidationError;
import org.projectforge.business.ldap.GroupDOConverter;
@@ -40,10 +39,8 @@ import org.projectforge.business.ldap.LdapPosixGroupsUtils;
import org.projectforge.business.ldap.LdapUserDao;
import org.projectforge.business.login.Login;
import org.projectforge.business.user.GroupDao;
-import org.projectforge.business.user.UserDao;
import org.projectforge.business.user.UsersComparator;
import org.projectforge.business.user.service.UserService;
-import org.projectforge.framework.access.AccessChecker;
import org.projectforge.framework.persistence.user.entities.GroupDO;
import org.projectforge.framework.persistence.user.entities.PFUserDO;
import org.projectforge.web.WicketSupport;
4efcbd0fb
Migración en curso...4efcbd0fb62fb527758bd7d1834d604382c55b33
diff --git a/projectforge-wicket/src/main/java/org/projectforge/web/user/GroupEditForm.java b/projectforge-wicket/src/main/java/org/projectforge/web/user/GroupEditForm.java
index aedc5242c..faf770e95 100644
--- a/projectforge-wicket/src/main/java/org/projectforge/web/user/GroupEditForm.java
+++ b/projectforge-wicket/src/main/java/org/projectforge/web/user/GroupEditForm.java
@@ -46,6 +46,7 @@ import org.projectforge.business.user.service.UserService;
import org.projectforge.framework.access.AccessChecker;
import org.projectforge.framework.persistence.user.entities.GroupDO;
import org.projectforge.framework.persistence.user.entities.PFUserDO;
+import org.projectforge.web.WicketSupport;
import org.projectforge.web.common.MultiChoiceListHelper;
import org.projectforge.web.wicket.AbstractEditForm;
import org.projectforge.web.wicket.WebConstants;
@@ -70,27 +71,6 @@ public class GroupEditForm extends AbstractEditForm<GroupDO, GroupEditPage>
private static final org.slf4j.Logger log = org.slf4j.LoggerFactory.getLogger(GroupEditForm.class);
- @SpringBean
- private AccessChecker accessChecker;
-
- @SpringBean
- private GroupDao groupDao;
-
- @SpringBean
- UserDao userDao;
-
- @SpringBean
- UserService userService;
-
- @SpringBean
- GroupDOConverter groupDOConverter;
-
- @SpringBean
- LdapPosixGroupsUtils ldapPosixGroupsUtils;
-
- @SpringBean
- LdapUserDao ldapUserDao;
-
MultiChoiceListHelper<PFUserDO> assignUsersListHelper;
@@ -121,7 +101,7 @@ public class GroupEditForm extends AbstractEditForm<GroupDO, GroupEditPage>
name.add((IValidator<String>) validatable -> {
final String groupname = validatable.getValue();
getData().setName(groupname);
- if (groupDao.doesGroupnameAlreadyExist(getData()) == true) {
+ if (WicketSupport.get(GroupDao.class).doesGroupnameAlreadyExist(getData()) == true) {
validatable.error(new ValidationError().addKey("group.error.groupnameAlreadyExists"));
}
});
@@ -154,7 +134,7 @@ public class GroupEditForm extends AbstractEditForm<GroupDO, GroupEditPage>
// Usuarios asignados
final FieldsetPanel fs = gridBuilder.newFieldset(getString("group.assignedUsers")).setLabelSide(false);
final Set<PFUserDO> assignedUsers = getData().getAssignedUsers();
- final UsersProvider usersProvider = new UsersProvider(userDao);
+ final UsersProvider usersProvider = new UsersProvider(WicketSupport.getUserDao());
assignUsersListHelper = new MultiChoiceListHelper<PFUserDO>().setComparator(new UsersComparator()).setFullList(
usersProvider.getSortedUsers());
if (assignedUsers != null) {
@@ -174,9 +154,9 @@ public class GroupEditForm extends AbstractEditForm<GroupDO, GroupEditPage> b6092df09
Copyright 2023 -> 2024b6092df0927c4a3b161e888445f31dcab57493f2
diff --git a/projectforge-wicket/src/main/java/org/projectforge/web/user/GroupEditForm.java b/projectforge-wicket/src/main/java/org/projectforge/web/user/GroupEditForm.java
index 9a84c959f..aedc5242c 100644
--- a/projectforge-wicket/src/main/java/org/projectforge/web/user/GroupEditForm.java
+++ b/projectforge-wicket/src/main/java/org/projectforge/web/user/GroupEditForm.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.
//