Skip to content
Snippets Groups Projects
Commit c09e9300 authored by srosse's avatar srosse
Browse files

OO-291: fix logging after the changes to the business path for the back button

parent 8f06b0f0
No related branches found
No related tags found
No related merge requests found
...@@ -39,8 +39,10 @@ import org.olat.core.gui.translator.Translator; ...@@ -39,8 +39,10 @@ import org.olat.core.gui.translator.Translator;
import org.olat.core.id.OLATResourceable; import org.olat.core.id.OLATResourceable;
import org.olat.core.id.context.BusinessControlFactory; import org.olat.core.id.context.BusinessControlFactory;
import org.olat.core.id.context.StateSite; 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.Util;
import org.olat.core.util.resource.OresHelper; import org.olat.core.util.resource.OresHelper;
import org.olat.util.logging.activity.LoggingResourceable;
/** /**
* Description:<br> * Description:<br>
...@@ -78,8 +80,9 @@ public class GroupsSite implements SiteInstance { ...@@ -78,8 +80,9 @@ public class GroupsSite implements SiteInstance {
*/ */
public MainLayoutController createController(UserRequest ureq, WindowControl wControl) { public MainLayoutController createController(UserRequest ureq, WindowControl wControl) {
//fxdiff BAKS-7 Resume function //fxdiff BAKS-7 Resume function
OLATResourceable libraryOres = OresHelper.createOLATResourceableInstance(GroupsSite.class, 0l); OLATResourceable ores = OresHelper.createOLATResourceableInstance(GroupsSite.class, 0l);
WindowControl bwControl = BusinessControlFactory.getInstance().createBusinessWindowControl(ureq, libraryOres, new StateSite(this), wControl, true); 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); MainLayoutController c = ControllerFactory.createLaunchController(ORES_GROUPS, null, ureq, bwControl, true);
return c; return c;
} }
......
...@@ -27,10 +27,12 @@ import org.olat.core.gui.components.table.CustomRenderColumnDescriptor; ...@@ -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.components.table.DefaultColumnDescriptor;
import org.olat.core.gui.control.WindowControl; import org.olat.core.gui.control.WindowControl;
import org.olat.core.id.OLATResourceable; import org.olat.core.id.OLATResourceable;
import org.olat.core.logging.activity.ThreadLocalUserActivityLogger;
import org.olat.core.util.resource.OresHelper; import org.olat.core.util.resource.OresHelper;
import org.olat.group.BusinessGroup; import org.olat.group.BusinessGroup;
import org.olat.group.model.SearchBusinessGroupParams; import org.olat.group.model.SearchBusinessGroupParams;
import org.olat.group.ui.main.BusinessGroupTableModelWithType.Cols; import org.olat.group.ui.main.BusinessGroupTableModelWithType.Cols;
import org.olat.util.logging.activity.LoggingResourceable;
/** /**
* *
...@@ -83,6 +85,7 @@ public class OpenBusinessGroupListController extends AbstractBusinessGroupListCo ...@@ -83,6 +85,7 @@ public class OpenBusinessGroupListController extends AbstractBusinessGroupListCo
updateTableModel(params, false); updateTableModel(params, false);
OLATResourceable ores = OresHelper.createOLATResourceableInstance("All", 0l); OLATResourceable ores = OresHelper.createOLATResourceableInstance("All", 0l);
ThreadLocalUserActivityLogger.addLoggingResourceInfo(LoggingResourceable.wrapBusinessPath(ores));
addToHistory(ureq, ores, null); addToHistory(ureq, ores, null);
} }
} }
\ No newline at end of file
...@@ -37,7 +37,9 @@ import org.olat.core.id.OLATResourceable; ...@@ -37,7 +37,9 @@ import org.olat.core.id.OLATResourceable;
import org.olat.core.id.context.BusinessControlFactory; import org.olat.core.id.context.BusinessControlFactory;
import org.olat.core.id.context.ContextEntry; import org.olat.core.id.context.ContextEntry;
import org.olat.core.id.context.StateEntry; import org.olat.core.id.context.StateEntry;
import org.olat.core.logging.activity.ThreadLocalUserActivityLogger;
import org.olat.core.util.resource.OresHelper; 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 ...@@ -108,6 +110,7 @@ public class OpenBusinessGroupsController extends BasicController implements Act
private SearchOpenBusinessGroupListController getSearchGroupsController(UserRequest ureq) { private SearchOpenBusinessGroupListController getSearchGroupsController(UserRequest ureq) {
if(searchController == null) { if(searchController == null) {
OLATResourceable ores = OresHelper.createOLATResourceableInstance("Search", 0l); OLATResourceable ores = OresHelper.createOLATResourceableInstance("Search", 0l);
ThreadLocalUserActivityLogger.addLoggingResourceInfo(LoggingResourceable.wrapBusinessPath(ores));
WindowControl bwControl = BusinessControlFactory.getInstance().createBusinessWindowControl(ores, null, getWindowControl()); WindowControl bwControl = BusinessControlFactory.getInstance().createBusinessWindowControl(ores, null, getWindowControl());
searchController = new SearchOpenBusinessGroupListController(ureq, bwControl); searchController = new SearchOpenBusinessGroupListController(ureq, bwControl);
listenTo(searchController); listenTo(searchController);
...@@ -121,6 +124,7 @@ public class OpenBusinessGroupsController extends BasicController implements Act ...@@ -121,6 +124,7 @@ public class OpenBusinessGroupsController extends BasicController implements Act
private OpenBusinessGroupListController getOpenGroups(UserRequest ureq) { private OpenBusinessGroupListController getOpenGroups(UserRequest ureq) {
if(listController == null) { if(listController == null) {
OLATResourceable ores = OresHelper.createOLATResourceableInstance("All", 0l); OLATResourceable ores = OresHelper.createOLATResourceableInstance("All", 0l);
ThreadLocalUserActivityLogger.addLoggingResourceInfo(LoggingResourceable.wrapBusinessPath(ores));
WindowControl bwControl = BusinessControlFactory.getInstance().createBusinessWindowControl(ores, null, getWindowControl()); WindowControl bwControl = BusinessControlFactory.getInstance().createBusinessWindowControl(ores, null, getWindowControl());
listController = new OpenBusinessGroupListController(ureq, bwControl); listController = new OpenBusinessGroupListController(ureq, bwControl);
listenTo(listController); listenTo(listController);
......
...@@ -19,7 +19,9 @@ import org.olat.core.id.OLATResourceable; ...@@ -19,7 +19,9 @@ import org.olat.core.id.OLATResourceable;
import org.olat.core.id.context.BusinessControlFactory; import org.olat.core.id.context.BusinessControlFactory;
import org.olat.core.id.context.ContextEntry; import org.olat.core.id.context.ContextEntry;
import org.olat.core.id.context.StateEntry; import org.olat.core.id.context.StateEntry;
import org.olat.core.logging.activity.ThreadLocalUserActivityLogger;
import org.olat.core.util.resource.OresHelper; import org.olat.core.util.resource.OresHelper;
import org.olat.util.logging.activity.LoggingResourceable;
/** /**
* *
...@@ -115,6 +117,7 @@ public class OverviewBusinessGroupListController extends BasicController impleme ...@@ -115,6 +117,7 @@ public class OverviewBusinessGroupListController extends BasicController impleme
private FavoritBusinessGroupListController updateMarkedGroups(UserRequest ureq) { private FavoritBusinessGroupListController updateMarkedGroups(UserRequest ureq) {
if(favoritGroupsCtrl == null) { if(favoritGroupsCtrl == null) {
OLATResourceable ores = OresHelper.createOLATResourceableInstance("Favorits", 0l); OLATResourceable ores = OresHelper.createOLATResourceableInstance("Favorits", 0l);
ThreadLocalUserActivityLogger.addLoggingResourceInfo(LoggingResourceable.wrapBusinessPath(ores));
WindowControl bwControl = BusinessControlFactory.getInstance().createBusinessWindowControl(ores, null, getWindowControl()); WindowControl bwControl = BusinessControlFactory.getInstance().createBusinessWindowControl(ores, null, getWindowControl());
favoritGroupsCtrl = new FavoritBusinessGroupListController(ureq, bwControl); favoritGroupsCtrl = new FavoritBusinessGroupListController(ureq, bwControl);
} }
...@@ -126,6 +129,7 @@ public class OverviewBusinessGroupListController extends BasicController impleme ...@@ -126,6 +129,7 @@ public class OverviewBusinessGroupListController extends BasicController impleme
private BusinessGroupListController updateAllGroups(UserRequest ureq) { private BusinessGroupListController updateAllGroups(UserRequest ureq) {
if(allGroupsCtrl == null) { if(allGroupsCtrl == null) {
OLATResourceable ores = OresHelper.createOLATResourceableInstance("AllGroups", 0l); OLATResourceable ores = OresHelper.createOLATResourceableInstance("AllGroups", 0l);
ThreadLocalUserActivityLogger.addLoggingResourceInfo(LoggingResourceable.wrapBusinessPath(ores));
WindowControl bwControl = BusinessControlFactory.getInstance().createBusinessWindowControl(ores, null, getWindowControl()); WindowControl bwControl = BusinessControlFactory.getInstance().createBusinessWindowControl(ores, null, getWindowControl());
allGroupsCtrl = new BusinessGroupListController(ureq, bwControl); allGroupsCtrl = new BusinessGroupListController(ureq, bwControl);
} }
...@@ -138,6 +142,7 @@ public class OverviewBusinessGroupListController extends BasicController impleme ...@@ -138,6 +142,7 @@ public class OverviewBusinessGroupListController extends BasicController impleme
private OwnedBusinessGroupListController updateOwnedGroups(UserRequest ureq) { private OwnedBusinessGroupListController updateOwnedGroups(UserRequest ureq) {
if(ownedGroupsCtrl == null) { if(ownedGroupsCtrl == null) {
OLATResourceable ores = OresHelper.createOLATResourceableInstance("OwnedGroups", 0l); OLATResourceable ores = OresHelper.createOLATResourceableInstance("OwnedGroups", 0l);
ThreadLocalUserActivityLogger.addLoggingResourceInfo(LoggingResourceable.wrapBusinessPath(ores));
WindowControl bwControl = BusinessControlFactory.getInstance().createBusinessWindowControl(ores, null, getWindowControl()); WindowControl bwControl = BusinessControlFactory.getInstance().createBusinessWindowControl(ores, null, getWindowControl());
ownedGroupsCtrl = new OwnedBusinessGroupListController(ureq, bwControl); ownedGroupsCtrl = new OwnedBusinessGroupListController(ureq, bwControl);
} }
...@@ -150,6 +155,7 @@ public class OverviewBusinessGroupListController extends BasicController impleme ...@@ -150,6 +155,7 @@ public class OverviewBusinessGroupListController extends BasicController impleme
private SearchBusinessGroupListController updateSearch(UserRequest ureq) { private SearchBusinessGroupListController updateSearch(UserRequest ureq) {
if(searchGroupsCtrl == null) { if(searchGroupsCtrl == null) {
OLATResourceable ores = OresHelper.createOLATResourceableInstance("Search", 0l); OLATResourceable ores = OresHelper.createOLATResourceableInstance("Search", 0l);
ThreadLocalUserActivityLogger.addLoggingResourceInfo(LoggingResourceable.wrapBusinessPath(ores));
WindowControl bwControl = BusinessControlFactory.getInstance().createBusinessWindowControl(ores, null, getWindowControl()); WindowControl bwControl = BusinessControlFactory.getInstance().createBusinessWindowControl(ores, null, getWindowControl());
searchGroupsCtrl = new SearchBusinessGroupListController(ureq, bwControl); searchGroupsCtrl = new SearchBusinessGroupListController(ureq, bwControl);
} }
......
...@@ -4,3 +4,9 @@ ...@@ -4,3 +4,9 @@
$r.render("searchPanel") $r.render("searchPanel")
<p /> <p />
$r.render("groupList") $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
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment