From 43e04d1a9d1f05a6ab746a2dba060b3aa748955b Mon Sep 17 00:00:00 2001
From: srosse <none@none>
Date: Thu, 17 Jan 2013 08:36:51 +0100
Subject: [PATCH] OO-502: the marked groups are loaded only once at start
---
.../ui/main/AbstractBusinessGroupListController.java | 6 ++++++
.../ui/main/OverviewBusinessGroupListController.java | 8 ++++----
2 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/src/main/java/org/olat/group/ui/main/AbstractBusinessGroupListController.java b/src/main/java/org/olat/group/ui/main/AbstractBusinessGroupListController.java
index ff6a582ed29..22f5a9043ff 100644
--- a/src/main/java/org/olat/group/ui/main/AbstractBusinessGroupListController.java
+++ b/src/main/java/org/olat/group/ui/main/AbstractBusinessGroupListController.java
@@ -201,6 +201,12 @@ public abstract class AbstractBusinessGroupListController extends BasicControlle
return admin;
}
+ protected boolean isEmpty() {
+ return groupListCtr == null ? true :
+ (groupListCtr.getTableDataModel() == null ? true :
+ groupListCtr.getTableDataModel().getRowCount() == 0);
+ }
+
@Override
protected void doDispose() {
//
diff --git a/src/main/java/org/olat/group/ui/main/OverviewBusinessGroupListController.java b/src/main/java/org/olat/group/ui/main/OverviewBusinessGroupListController.java
index 44a956cda85..bae424fc273 100644
--- a/src/main/java/org/olat/group/ui/main/OverviewBusinessGroupListController.java
+++ b/src/main/java/org/olat/group/ui/main/OverviewBusinessGroupListController.java
@@ -65,8 +65,8 @@ public class OverviewBusinessGroupListController extends BasicController impleme
mainVC = createVelocityContainer("group_list_overview");
- boolean marked = updateMarkedGroups(ureq).updateMarkedGroups();
- if(!marked) {
+ boolean markedEmpty = updateMarkedGroups(ureq).isEmpty();
+ if(markedEmpty) {
updateAllGroups(ureq);
}
@@ -74,10 +74,10 @@ public class OverviewBusinessGroupListController extends BasicController impleme
segmentView = SegmentViewFactory.createSegmentView("segments", mainVC, this);
markedGroupsLink = LinkFactory.createLink("marked.groups", mainVC, this);
markedGroupsLink.setElementCssClass("o_sel_group_bookmarked_groups_seg");
- segmentView.addSegment(markedGroupsLink, marked);
+ segmentView.addSegment(markedGroupsLink, !markedEmpty);
allGroupsLink = LinkFactory.createLink("opengroups.all", mainVC, this);
allGroupsLink.setElementCssClass("o_sel_group_all_groups_seg");
- segmentView.addSegment(allGroupsLink, !marked);
+ segmentView.addSegment(allGroupsLink, markedEmpty);
ownedGroupsLink = LinkFactory.createLink("owned.groups", mainVC, this);
ownedGroupsLink.setElementCssClass("o_sel_group_owned_groups_seg");
segmentView.addSegment(ownedGroupsLink, false);
--
GitLab