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

OO-3647: pass the extended search parameter of the business group

In the coached group search, pass the extended search parameters up-to
the query, preselect the "coach" role in the search panel
parent 624005e4
No related branches found
No related tags found
No related merge requests found
......@@ -22,6 +22,7 @@ package org.olat.group.ui.main;
import java.util.Collections;
import java.util.List;
import org.olat.basesecurity.GroupRoles;
import org.olat.core.CoreSpringFactory;
import org.olat.core.gui.UserRequest;
import org.olat.core.gui.components.form.flexible.FormItem;
......@@ -210,6 +211,18 @@ public class BusinessGroupSearchController extends FormBasicController implement
publicEl.setVisible(enable);
}
public void setPreselectedRoles(GroupRoles role) {
if(rolesEl != null) {
if(role == GroupRoles.coach) {
rolesEl.select("owner", true);
} else if(role == GroupRoles.participant) {
rolesEl.select("attendee", true);
} else if(role == GroupRoles.waiting) {
rolesEl.select("waiting", true);
}
}
}
/**
* @return True if the text search fields are empty
*/
......@@ -227,9 +240,7 @@ public class BusinessGroupSearchController extends FormBasicController implement
protected boolean validateFormLogic(UserRequest ureq) {
if(!enabled) return true;
boolean allOk = true;
return allOk & super.validateFormLogic(ureq);
return super.validateFormLogic(ureq);
}
@Override
......
......@@ -19,6 +19,7 @@
*/
package org.olat.group.ui.main;
import org.olat.basesecurity.GroupRoles;
import org.olat.core.gui.UserRequest;
import org.olat.core.gui.components.form.flexible.FormItemContainer;
import org.olat.core.gui.control.WindowControl;
......@@ -32,6 +33,8 @@ public class SelectOwnedBusinessGroupController extends AbstractSelectBusinessGr
public SelectOwnedBusinessGroupController(UserRequest ureq, WindowControl wControl) {
super(ureq, wControl, "group_list", "sel-owned");
searchCtrl.setPreselectedRoles(GroupRoles.coach);
}
@Override
......@@ -47,7 +50,9 @@ public class SelectOwnedBusinessGroupController extends AbstractSelectBusinessGr
@Override
protected BusinessGroupQueryParams getSearchParams(SearchEvent event) {
BusinessGroupQueryParams params = new BusinessGroupQueryParams(true, false);
BusinessGroupQueryParams params = event.convertToBusinessGroupQueriesParams();
params.setOwner(true);
params.setAttendee(false);
params.setWaiting(false);
return params;
}
......@@ -55,6 +60,8 @@ public class SelectOwnedBusinessGroupController extends AbstractSelectBusinessGr
@Override
protected BusinessGroupQueryParams getDefaultSearchParams() {
BusinessGroupQueryParams params = new BusinessGroupQueryParams(true, false);
params.setOwner(true);
params.setAttendee(false);
params.setWaiting(false);
return params;
}
......
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