diff --git a/src/main/java/org/olat/group/manager/BusinessGroupDAO.java b/src/main/java/org/olat/group/manager/BusinessGroupDAO.java index b63c8d32d7c00a4e2225b1b4faf882283d111ee5..a42f913fa432b01dc14424276a334e53325ca6ce 100644 --- a/src/main/java/org/olat/group/manager/BusinessGroupDAO.java +++ b/src/main/java/org/olat/group/manager/BusinessGroupDAO.java @@ -1266,11 +1266,12 @@ public class BusinessGroupDAO { StringBuilder so = new StringBuilder(); so.append("select access.method, resource.key, offer.price from acofferaccess access ") .append(" inner join access.offer offer") - .append(" inner join offer.resource resource"); + .append(" inner join offer.resource resource") + .append(" where offer.valid=true"); if(resourceKeyToGroup.size() < OFFERS_IN_LIMIT) { - so.append(" where resource.key in (:resourceKeys)"); + so.append(" and resource.key in (:resourceKeys)"); } else { - so.append(" where exists (select bgi.key from businessgroup bgi where bgi.resource=resource)"); + so.append(" and exists (select bgi.key from businessgroup bgi where bgi.resource=resource)"); } TypedQuery<Object[]> offersQuery = dbInstance.getCurrentEntityManager() diff --git a/src/main/java/org/olat/group/ui/main/BusinessGroupListFlexiTableModel.java b/src/main/java/org/olat/group/ui/main/BusinessGroupListFlexiTableModel.java index 5c5747adcb1e3d985f2a7424d188fb3a7a39bc43..5a825ee3bcf5ce22e5adfd5c4a9f462dbd9edb80 100644 --- a/src/main/java/org/olat/group/ui/main/BusinessGroupListFlexiTableModel.java +++ b/src/main/java/org/olat/group/ui/main/BusinessGroupListFlexiTableModel.java @@ -95,7 +95,7 @@ public class BusinessGroupListFlexiTableModel extends DefaultFlexiTableDataModel case resources: return wrapped; case accessControl: - return new Boolean(wrapped.isAccessControl()); + return Boolean.valueOf(wrapped.isAccessControl()); case accessControlLaunch: return wrapped.getAccessLink(); case accessTypes: