Fix primefaces#9552: Datatable do not select @ALL with disabledSelection

melloware · Dec 26, 2022 · 18736d0 · 18736d0
1 parent 0675825
commit 18736d0
Showing 1 changed file with 9 additions and 8 deletions.
diff --git a/primefaces/src/main/java/org/primefaces/component/datatable/feature/SelectionFeature.java b/primefaces/src/main/java/org/primefaces/component/datatable/feature/SelectionFeature.java
@@ -23,19 +23,20 @@
  */
 package org.primefaces.component.datatable.feature;
 
+import java.io.IOException;
+import java.lang.reflect.Array;
+import java.util.*;
+
+import javax.el.ValueExpression;
+import javax.faces.FacesException;
+import javax.faces.context.FacesContext;
+
 import org.primefaces.component.datatable.DataTable;
 import org.primefaces.component.datatable.DataTableBase;
 import org.primefaces.component.datatable.DataTableRenderer;
 import org.primefaces.component.datatable.DataTableState;
 import org.primefaces.util.LangUtils;
 
-import javax.el.ValueExpression;
-import javax.faces.FacesException;
-import javax.faces.context.FacesContext;
-import java.io.IOException;
-import java.lang.reflect.Array;
-import java.util.*;
-
 public class SelectionFeature implements DataTableFeature {
 
     private static final String ALL_SELECTOR = "@all";
@@ -220,7 +221,7 @@ protected boolean isSelectable(DataTable table, String var, Map<String, Object>
             requestMap.put(var, o);
         }
 
-        boolean selectable = table.isSelectionEnabled();
+        boolean selectable = table.isSelectionEnabled() && !table.isDisabledSelection();
 
         if (!containsVar) {
             requestMap.remove(var);