UserPrefEditForm fixed: creation of task favorites.

micromata · Jan 23, 2025 · 15a4494 · 15a4494
1 parent b1742ce
commit 15a4494
Showing 1 changed file with 8 additions and 16 deletions.
diff --git a/projectforge-wicket/src/main/java/org/projectforge/web/user/UserPrefEditForm.java b/projectforge-wicket/src/main/java/org/projectforge/web/user/UserPrefEditForm.java
@@ -235,8 +235,7 @@ void createParameterRepeaterChildren()
         WicketSupport.get(UserPrefDao.class).updateParameterValueObject(param);
         if (PFUserDO.class.isAssignableFrom(param.getType()) == true) {
           final UserSelectPanel userSelectPanel = new UserSelectPanel(fs.newChildId(),
-              new UserPrefPropertyModel<PFUserDO>(userPrefDao,
-                  param, "valueAsObject"),
+              new UserPrefPropertyModel<PFUserDO>(param, "valueAsObject"),
               parentPage, param.getParameter());
           if (data.getAreaObject() == UserPrefArea.USER_FAVORITE) {
             userSelectPanel.setShowFavorites(false);
@@ -245,8 +244,7 @@ void createParameterRepeaterChildren()
           userSelectPanel.init();
         } else if (TaskDO.class.isAssignableFrom(param.getType()) == true) {
           final TaskSelectPanel taskSelectPanel = new TaskSelectPanel(fs,
-              new UserPrefPropertyModel<TaskDO>(userPrefDao, param,
-                  "valueAsObject"),
+              new UserPrefPropertyModel<TaskDO>(param, "valueAsObject"),
               parentPage, param.getParameter());
           if (data.getAreaObject() == UserPrefArea.TASK_FAVORITE) {
             taskSelectPanel.setShowFavorites(false);
@@ -255,8 +253,7 @@ void createParameterRepeaterChildren()
           taskSelectPanel.init();
         } else if (GroupDO.class.isAssignableFrom(param.getType()) == true) {
           final NewGroupSelectPanel groupSelectPanel = new NewGroupSelectPanel(fs.newChildId(),
-              new UserPrefPropertyModel<GroupDO>(
-                  userPrefDao, param, "valueAsObject"),
+              new UserPrefPropertyModel<GroupDO>(param, "valueAsObject"),
               parentPage, param.getParameter());
           fs.add(groupSelectPanel);
           groupSelectPanel.init();
@@ -286,8 +283,7 @@ protected void setKost2Id(final Long kost2Id)
           dependentsMap.put(param.getParameter(), kost2DropDownChoice);
         } else if (ProjektDO.class.isAssignableFrom(param.getType()) == true) {
           final NewProjektSelectPanel projektSelectPanel = new NewProjektSelectPanel(fs.newChildId(),
-              new UserPrefPropertyModel<ProjektDO>(
-                  userPrefDao, param, "valueAsObject"),
+              new UserPrefPropertyModel<ProjektDO>(param, "valueAsObject"),
               parentPage, param.getParameter());
           if (data.getAreaObject() == UserPrefArea.PROJEKT_FAVORITE) {
             projektSelectPanel.setShowFavorites(false);
@@ -296,8 +292,7 @@ protected void setKost2Id(final Long kost2Id)
           projektSelectPanel.init();
         } else if (KundeDO.class.isAssignableFrom(param.getType()) == true) {
           final NewCustomerSelectPanel kundeSelectPanel = new NewCustomerSelectPanel(fs.newChildId(),
-              new UserPrefPropertyModel<KundeDO>(
-                  userPrefDao, param, "valueAsObject"),
+              new UserPrefPropertyModel<KundeDO>(param, "valueAsObject"),
               null, parentPage, param.getParameter());
           if (data.getAreaObject() == UserPrefArea.KUNDE_FAVORITE) {
             kundeSelectPanel.setShowFavorites(false);
@@ -315,7 +310,7 @@ protected void setKost2Id(final Long kost2Id)
           final LabelValueChoiceRenderer<I18nEnum> choiceRenderer = new LabelValueChoiceRenderer<I18nEnum>(this,
               (I18nEnum[]) param.getType().getEnumConstants());
           final DropDownChoice<I18nEnum> choice = new DropDownChoice<I18nEnum>(fs.getDropDownChoiceId(),
-              new UserPrefPropertyModel<I18nEnum>(userPrefDao, param, "valueAsObject"), choiceRenderer.getValues(),
+              new UserPrefPropertyModel<I18nEnum>(param, "valueAsObject"), choiceRenderer.getValues(),
               choiceRenderer);
           choice.setNullValid(true);
           fs.add(choice);
@@ -349,23 +344,20 @@ private class UserPrefPropertyModel<T> extends PropertyModel<T>
   {
     private static final long serialVersionUID = 6644505091461853375L;
 
-    private final UserPrefDao userPrefDao;
-
     private final UserPrefEntryDO userPrefEntry;
 
-    public UserPrefPropertyModel(final UserPrefDao userPrefDao, final UserPrefEntryDO userPrefEntry,
+    public UserPrefPropertyModel(final UserPrefEntryDO userPrefEntry,
         final String expression)
     {
       super(userPrefEntry, expression);
-      this.userPrefDao = userPrefDao;
       this.userPrefEntry = userPrefEntry;
     }
 
     @Override
     public void setObject(final T object)
     {
       super.setObject(object);
-      userPrefDao.setValueObject(userPrefEntry, object);
+      WicketSupport.get(UserPrefDao.class).setValueObject(userPrefEntry, object);
     }
   }
 }