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

OO-1068: fix owned missing group list, add default in activate path in groups...

OO-1068: fix owned missing group list, add default in activate path in groups and repository entries sites, fix some business path in portal
parent 2f0d5c2e
No related branches found
No related tags found
No related merge requests found
Showing
with 13 additions and 25 deletions
......@@ -212,7 +212,7 @@ public class BookmarksPortletRunController extends AbstractPortletRunController<
public void event(UserRequest ureq, Component source, Event event) {
if (source == showAllLink){
// activate homes tab in top navigation and active bookmarks menu item
String resourceUrl = "[HomeSite:" + ureq.getIdentity().getKey() + "][bookmarks:0]";
String resourceUrl = "[MyCoursesSite:0][Favorits:0]";
BusinessControl bc = BusinessControlFactory.getInstance().createFromString(resourceUrl);
WindowControl bwControl = BusinessControlFactory.getInstance().createBusinessWindowControl(bc, getWindowControl());
NewControllerFactory.getInstance().launch(ureq, bwControl);
......
......@@ -158,6 +158,9 @@ public class OverviewBusinessGroupListController extends BasicController impleme
} else if("Search".equals(segment) && searchOpenLink != null) {
updateSearch(ureq).activate(ureq, subEntries, entry.getTransientState());
segmentView.select(searchOpenLink);
} else {//default all groups
updateMyGroups(ureq).activate(ureq, subEntries, entry.getTransientState());
segmentView.select(myGroupsLink);
}
}
}
......
......@@ -32,7 +32,7 @@ import org.olat.group.model.SearchBusinessGroupParams;
public class SelectOwnedBusinessGroupController extends AbstractBusinessGroupListController {
public SelectOwnedBusinessGroupController(UserRequest ureq, WindowControl wControl) {
super(ureq, wControl, "select_group_list", "sel-owned");
super(ureq, wControl, "group_list", "sel-owned");
}
@Override
......
<div class="clearfix">
#if($r.available("search"))
$r.render("search")
#end
$r.render("groupList")
</div>
<h2><i class="o_icon o_icon_group"> </i> $r.translate("open.header")</h2>
<div class="o_info">$r.translate("open.intro")</div>
$r.render("segments")
<div class="o_segments_content clearfix">
$r.render("groupList")
</div>
<div class="clearfix">
$r.render("groupList")
</div>
\ No newline at end of file
......@@ -199,7 +199,7 @@ public class GroupsPortletRunController extends AbstractPortletRunController<Bus
*/
public void event(UserRequest ureq, Component source, Event event) {
if (source == showAllLink) {
String businessPath = "[GroupsSite:0][MyGroups:0][AllGroups:0]";
String businessPath = "[GroupsSite:0][AllGroups:0]";
NewControllerFactory.getInstance().launch(businessPath, ureq, getWindowControl());
}
}
......
......@@ -69,15 +69,15 @@ public class QuickstartPortletRunController extends DefaultController {
Roles roles = ureq.getUserSession().getRoles();
if (roles.isGuestOnly()) {
this.quickstartVC = new VelocityContainer("quickstartVC", VELOCITY_ROOT + "/quickstartPortletGuest.html", trans, this);
quickstartVC = new VelocityContainer("quickstartVC", VELOCITY_ROOT + "/quickstartPortletGuest.html", trans, this);
} else {
this.quickstartVC = new VelocityContainer("quickstartVC", VELOCITY_ROOT + "/quickstartPortlet.html", trans, this);
quickstartVC = new VelocityContainer("quickstartVC", VELOCITY_ROOT + "/quickstartPortlet.html", trans, this);
}
helpLink = LinkFactory.createLink("quickstart.link.help", quickstartVC, this);
helpLink.setTooltip("quickstart.ttip.help");
helpLink.setTarget("_help");
setInitialComponent(this.quickstartVC);
setInitialComponent(quickstartVC);
}
public void event(UserRequest ureq, Component source, Event event) {
......@@ -85,9 +85,9 @@ public class QuickstartPortletRunController extends DefaultController {
String cmd = event.getCommand();
String businessPath = null;
if (cmd.equals("cmd.repo.course")) {
businessPath = "[RepositorySite:0][search.course:0]";
businessPath = "[MyCoursesSite:0]";
} else if (cmd.equals("cmd.repo.catalog")) {
businessPath = "[RepositorySite:0][search.catalog:0]";
businessPath = "[MyCoursesSite:0][Catalog:0]";
} else if (cmd.equals("cmd.settings")) {
businessPath = "[HomeSite:" + ureq.getIdentity().getKey() + "][mysettings:0]";
} else if (cmd.equals("cmd.buddygroup.new")) {
......
......@@ -88,5 +88,5 @@ body .progress {
}
.btn.btn-primary.o_disabled {
color: $o-content-text-color !important;
color: $btn-primary-color !important;
}
This diff is collapsed.
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