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

OO-531: fix issue with the group search in the user import

parent 1453af33
No related branches found
No related tags found
No related merge requests found
...@@ -73,6 +73,7 @@ public class GroupSearchController extends StepFormBasicController { ...@@ -73,6 +73,7 @@ public class GroupSearchController extends StepFormBasicController {
private FormSubmit searchButton; private FormSubmit searchButton;
private FormLink saveLink, searchLink; private FormLink saveLink, searchLink;
private FormItem errorComp; private FormItem errorComp;
private FlexiTableElement table;
private FormLayoutContainer tableCont; private FormLayoutContainer tableCont;
private GroupTableDataModel tableDataModel; private GroupTableDataModel tableDataModel;
...@@ -131,7 +132,7 @@ public class GroupSearchController extends StepFormBasicController { ...@@ -131,7 +132,7 @@ public class GroupSearchController extends StepFormBasicController {
tableColumnModel.addFlexiColumnModel(new DefaultFlexiColumnModel(Cols.participant.i18n(), Cols.participant.ordinal())); tableColumnModel.addFlexiColumnModel(new DefaultFlexiColumnModel(Cols.participant.i18n(), Cols.participant.ordinal()));
tableDataModel = new GroupTableDataModel(Collections.<GroupWrapper>emptyList(), tableColumnModel); tableDataModel = new GroupTableDataModel(Collections.<GroupWrapper>emptyList(), tableColumnModel);
FlexiTableElement table = uifactory.addTableElement(ureq, getWindowControl(), "groupList", tableDataModel, tableCont); table = uifactory.addTableElement(ureq, getWindowControl(), "groupList", tableDataModel, tableCont);
tableCont.add("groupList", table); tableCont.add("groupList", table);
if (!isUsedInStepWizzard()) { if (!isUsedInStepWizzard()) {
...@@ -208,6 +209,7 @@ public class GroupSearchController extends StepFormBasicController { ...@@ -208,6 +209,7 @@ public class GroupSearchController extends StepFormBasicController {
groups.add(wrapper); groups.add(wrapper);
} }
table.reset();
tableDataModel.setObjects(groups); tableDataModel.setObjects(groups);
errorComp.clearError(); errorComp.clearError();
} }
...@@ -342,7 +344,7 @@ public class GroupSearchController extends StepFormBasicController { ...@@ -342,7 +344,7 @@ public class GroupSearchController extends StepFormBasicController {
} }
} }
private static class GroupTableDataModel extends DefaultTableDataModel<GroupWrapper> implements FlexiTableDataModel { private static class GroupTableDataModel extends DefaultTableDataModel<GroupWrapper> implements FlexiTableDataModel<GroupWrapper> {
private FlexiTableColumnModel columnModel; private FlexiTableColumnModel columnModel;
public GroupTableDataModel(List<GroupWrapper> options, FlexiTableColumnModel columnModel) { public GroupTableDataModel(List<GroupWrapper> options, FlexiTableColumnModel columnModel) {
......
...@@ -18,7 +18,6 @@ var o_info = new Object(); ...@@ -18,7 +18,6 @@ var o_info = new Object();
<script type="text/javascript" src="$r.staticLink("js/modernizr/modernizr.js")"></script> <script type="text/javascript" src="$r.staticLink("js/modernizr/modernizr.js")"></script>
## jQuery libraries ## jQuery libraries
<script type="text/javascript" src='$r.staticLink("js/jquery/jquery-1.9.1.min.js")'></script> <script type="text/javascript" src='$r.staticLink("js/jquery/jquery-1.9.1.min.js")'></script>
<script type="text/javascript" src='$r.staticLink("js/jquery/jquery-migrate-1.1.1.min.js")'></script>
<script> <script>
/* <![CDATA[ */ /* <![CDATA[ */
jQuery.noConflict(); jQuery.noConflict();
......
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