From c09e9300b9841a6ce2ae59cc0fcde819e6fad123 Mon Sep 17 00:00:00 2001
From: srosse <none@none>
Date: Fri, 3 Aug 2012 16:33:14 +0200
Subject: [PATCH] OO-291: fix logging after the changes to the business path
for the back button
---
src/main/java/org/olat/group/site/GroupsSite.java | 7 +++++--
.../group/ui/main/OpenBusinessGroupListController.java | 3 +++
.../olat/group/ui/main/OpenBusinessGroupsController.java | 4 ++++
.../group/ui/main/OverviewBusinessGroupListController.java | 6 ++++++
.../org/olat/group/ui/main/_content/admin_group_list.html | 6 ++++++
5 files changed, 24 insertions(+), 2 deletions(-)
diff --git a/src/main/java/org/olat/group/site/GroupsSite.java b/src/main/java/org/olat/group/site/GroupsSite.java
index 1eb086b5b47..185df441eff 100644
--- a/src/main/java/org/olat/group/site/GroupsSite.java
+++ b/src/main/java/org/olat/group/site/GroupsSite.java
@@ -39,8 +39,10 @@ import org.olat.core.gui.translator.Translator;
import org.olat.core.id.OLATResourceable;
import org.olat.core.id.context.BusinessControlFactory;
import org.olat.core.id.context.StateSite;
+import org.olat.core.logging.activity.ThreadLocalUserActivityLogger;
import org.olat.core.util.Util;
import org.olat.core.util.resource.OresHelper;
+import org.olat.util.logging.activity.LoggingResourceable;
/**
* Description:<br>
@@ -78,8 +80,9 @@ public class GroupsSite implements SiteInstance {
*/
public MainLayoutController createController(UserRequest ureq, WindowControl wControl) {
//fxdiff BAKS-7 Resume function
- OLATResourceable libraryOres = OresHelper.createOLATResourceableInstance(GroupsSite.class, 0l);
- WindowControl bwControl = BusinessControlFactory.getInstance().createBusinessWindowControl(ureq, libraryOres, new StateSite(this), wControl, true);
+ OLATResourceable ores = OresHelper.createOLATResourceableInstance(GroupsSite.class, 0l);
+ ThreadLocalUserActivityLogger.addLoggingResourceInfo(LoggingResourceable.wrapBusinessPath(ores));
+ WindowControl bwControl = BusinessControlFactory.getInstance().createBusinessWindowControl(ureq, ores, new StateSite(this), wControl, true);
MainLayoutController c = ControllerFactory.createLaunchController(ORES_GROUPS, null, ureq, bwControl, true);
return c;
}
diff --git a/src/main/java/org/olat/group/ui/main/OpenBusinessGroupListController.java b/src/main/java/org/olat/group/ui/main/OpenBusinessGroupListController.java
index 13a51856879..6e9d95c13b8 100644
--- a/src/main/java/org/olat/group/ui/main/OpenBusinessGroupListController.java
+++ b/src/main/java/org/olat/group/ui/main/OpenBusinessGroupListController.java
@@ -27,10 +27,12 @@ import org.olat.core.gui.components.table.CustomRenderColumnDescriptor;
import org.olat.core.gui.components.table.DefaultColumnDescriptor;
import org.olat.core.gui.control.WindowControl;
import org.olat.core.id.OLATResourceable;
+import org.olat.core.logging.activity.ThreadLocalUserActivityLogger;
import org.olat.core.util.resource.OresHelper;
import org.olat.group.BusinessGroup;
import org.olat.group.model.SearchBusinessGroupParams;
import org.olat.group.ui.main.BusinessGroupTableModelWithType.Cols;
+import org.olat.util.logging.activity.LoggingResourceable;
/**
*
@@ -83,6 +85,7 @@ public class OpenBusinessGroupListController extends AbstractBusinessGroupListCo
updateTableModel(params, false);
OLATResourceable ores = OresHelper.createOLATResourceableInstance("All", 0l);
+ ThreadLocalUserActivityLogger.addLoggingResourceInfo(LoggingResourceable.wrapBusinessPath(ores));
addToHistory(ureq, ores, null);
}
}
\ No newline at end of file
diff --git a/src/main/java/org/olat/group/ui/main/OpenBusinessGroupsController.java b/src/main/java/org/olat/group/ui/main/OpenBusinessGroupsController.java
index 4015cd7ed0c..752b970a3c3 100644
--- a/src/main/java/org/olat/group/ui/main/OpenBusinessGroupsController.java
+++ b/src/main/java/org/olat/group/ui/main/OpenBusinessGroupsController.java
@@ -37,7 +37,9 @@ import org.olat.core.id.OLATResourceable;
import org.olat.core.id.context.BusinessControlFactory;
import org.olat.core.id.context.ContextEntry;
import org.olat.core.id.context.StateEntry;
+import org.olat.core.logging.activity.ThreadLocalUserActivityLogger;
import org.olat.core.util.resource.OresHelper;
+import org.olat.util.logging.activity.LoggingResourceable;
/**
*
@@ -108,6 +110,7 @@ public class OpenBusinessGroupsController extends BasicController implements Act
private SearchOpenBusinessGroupListController getSearchGroupsController(UserRequest ureq) {
if(searchController == null) {
OLATResourceable ores = OresHelper.createOLATResourceableInstance("Search", 0l);
+ ThreadLocalUserActivityLogger.addLoggingResourceInfo(LoggingResourceable.wrapBusinessPath(ores));
WindowControl bwControl = BusinessControlFactory.getInstance().createBusinessWindowControl(ores, null, getWindowControl());
searchController = new SearchOpenBusinessGroupListController(ureq, bwControl);
listenTo(searchController);
@@ -121,6 +124,7 @@ public class OpenBusinessGroupsController extends BasicController implements Act
private OpenBusinessGroupListController getOpenGroups(UserRequest ureq) {
if(listController == null) {
OLATResourceable ores = OresHelper.createOLATResourceableInstance("All", 0l);
+ ThreadLocalUserActivityLogger.addLoggingResourceInfo(LoggingResourceable.wrapBusinessPath(ores));
WindowControl bwControl = BusinessControlFactory.getInstance().createBusinessWindowControl(ores, null, getWindowControl());
listController = new OpenBusinessGroupListController(ureq, bwControl);
listenTo(listController);
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 542c5542226..bb9541b2b87 100644
--- a/src/main/java/org/olat/group/ui/main/OverviewBusinessGroupListController.java
+++ b/src/main/java/org/olat/group/ui/main/OverviewBusinessGroupListController.java
@@ -19,7 +19,9 @@ import org.olat.core.id.OLATResourceable;
import org.olat.core.id.context.BusinessControlFactory;
import org.olat.core.id.context.ContextEntry;
import org.olat.core.id.context.StateEntry;
+import org.olat.core.logging.activity.ThreadLocalUserActivityLogger;
import org.olat.core.util.resource.OresHelper;
+import org.olat.util.logging.activity.LoggingResourceable;
/**
*
@@ -115,6 +117,7 @@ public class OverviewBusinessGroupListController extends BasicController impleme
private FavoritBusinessGroupListController updateMarkedGroups(UserRequest ureq) {
if(favoritGroupsCtrl == null) {
OLATResourceable ores = OresHelper.createOLATResourceableInstance("Favorits", 0l);
+ ThreadLocalUserActivityLogger.addLoggingResourceInfo(LoggingResourceable.wrapBusinessPath(ores));
WindowControl bwControl = BusinessControlFactory.getInstance().createBusinessWindowControl(ores, null, getWindowControl());
favoritGroupsCtrl = new FavoritBusinessGroupListController(ureq, bwControl);
}
@@ -126,6 +129,7 @@ public class OverviewBusinessGroupListController extends BasicController impleme
private BusinessGroupListController updateAllGroups(UserRequest ureq) {
if(allGroupsCtrl == null) {
OLATResourceable ores = OresHelper.createOLATResourceableInstance("AllGroups", 0l);
+ ThreadLocalUserActivityLogger.addLoggingResourceInfo(LoggingResourceable.wrapBusinessPath(ores));
WindowControl bwControl = BusinessControlFactory.getInstance().createBusinessWindowControl(ores, null, getWindowControl());
allGroupsCtrl = new BusinessGroupListController(ureq, bwControl);
}
@@ -138,6 +142,7 @@ public class OverviewBusinessGroupListController extends BasicController impleme
private OwnedBusinessGroupListController updateOwnedGroups(UserRequest ureq) {
if(ownedGroupsCtrl == null) {
OLATResourceable ores = OresHelper.createOLATResourceableInstance("OwnedGroups", 0l);
+ ThreadLocalUserActivityLogger.addLoggingResourceInfo(LoggingResourceable.wrapBusinessPath(ores));
WindowControl bwControl = BusinessControlFactory.getInstance().createBusinessWindowControl(ores, null, getWindowControl());
ownedGroupsCtrl = new OwnedBusinessGroupListController(ureq, bwControl);
}
@@ -150,6 +155,7 @@ public class OverviewBusinessGroupListController extends BasicController impleme
private SearchBusinessGroupListController updateSearch(UserRequest ureq) {
if(searchGroupsCtrl == null) {
OLATResourceable ores = OresHelper.createOLATResourceableInstance("Search", 0l);
+ ThreadLocalUserActivityLogger.addLoggingResourceInfo(LoggingResourceable.wrapBusinessPath(ores));
WindowControl bwControl = BusinessControlFactory.getInstance().createBusinessWindowControl(ores, null, getWindowControl());
searchGroupsCtrl = new SearchBusinessGroupListController(ureq, bwControl);
}
diff --git a/src/main/java/org/olat/group/ui/main/_content/admin_group_list.html b/src/main/java/org/olat/group/ui/main/_content/admin_group_list.html
index 3940337a786..d93b85e10dd 100644
--- a/src/main/java/org/olat/group/ui/main/_content/admin_group_list.html
+++ b/src/main/java/org/olat/group/ui/main/_content/admin_group_list.html
@@ -4,3 +4,9 @@
$r.render("searchPanel")
<p />
$r.render("groupList")
+#if($r.available("create.group"))
+ <div class="b_clearfix">
+ <p>$r.translate("create.group.description")</p>
+ $r.render("create.group")
+ </div>
+#end
--
GitLab