Merge branch 'pu/cf/rt/247382' into 'main'

fix(HumanResources): can not add freeTime over freeTimePlaningGrid See merge request tine20/tine20!6600
tine-groupware · Feb 18, 2025 · cd4a720 · cd4a720
2 parents 27b6a4f + 4ecfea6
commit cd4a720
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/tine20/HumanResources/js/FreeTimePlanningPanel.js b/tine20/HumanResources/js/FreeTimePlanningPanel.js
@@ -248,7 +248,7 @@ Tine.HumanResources.FreeTimePlanningPanel = Ext.extend(Tine.widgets.grid.GridPan
 
         let isDay = _.get(col, 'dataIndex') === 'virtual';
         let isSameRow = _.get(me.selectionModel.getSelections(), 0, cellInfo)[0] === cellInfo[0];
-        let isExludeDay = me.isExcludeDay(employee, col.day);
+        let isExludeDay = isDay && me.isExcludeDay(employee, col.day);
 
         return isDay && !isExludeDay && (keepExisting ? isSameRow : true);
     },
@@ -416,8 +416,8 @@ Tine.HumanResources.FreeTimePlanningPanel = Ext.extend(Tine.widgets.grid.GridPan
                 'type': this.freeTimeType,
                 'freedays': freedays,
                 'days_count': freedays.length,
-                'firstday_date': freedays[0],
-                'lastday_date': freedays[freedays.length-1]
+                'firstday_date': _.get(freedays[0], 'date'),
+                'lastday_date': _.get(freedays[freedays.length-1], 'date')
             });
         }