diff --git a/src/main/java/org/olat/admin/user/groups/GroupSearchController.java b/src/main/java/org/olat/admin/user/groups/GroupSearchController.java index 4b1b9ae0133ea825b5fe2368ef5d30774bd16b56..ca6ede704695d56b586cb74000565e414e14b4d5 100644 --- a/src/main/java/org/olat/admin/user/groups/GroupSearchController.java +++ b/src/main/java/org/olat/admin/user/groups/GroupSearchController.java @@ -73,6 +73,7 @@ public class GroupSearchController extends StepFormBasicController { private FormSubmit searchButton; private FormLink saveLink, searchLink; private FormItem errorComp; + private FlexiTableElement table; private FormLayoutContainer tableCont; private GroupTableDataModel tableDataModel; @@ -131,7 +132,7 @@ public class GroupSearchController extends StepFormBasicController { tableColumnModel.addFlexiColumnModel(new DefaultFlexiColumnModel(Cols.participant.i18n(), Cols.participant.ordinal())); 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); if (!isUsedInStepWizzard()) { @@ -208,6 +209,7 @@ public class GroupSearchController extends StepFormBasicController { groups.add(wrapper); } + table.reset(); tableDataModel.setObjects(groups); errorComp.clearError(); } @@ -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; public GroupTableDataModel(List<GroupWrapper> options, FlexiTableColumnModel columnModel) { diff --git a/src/main/java/org/olat/core/gui/exception/_content/exception_page.html b/src/main/java/org/olat/core/gui/exception/_content/exception_page.html index 20412ae3788a9fd7404494b6401fc1d2f59320b0..925fa9828a9ac728a476ad4a88fe466e3d87473d 100644 --- a/src/main/java/org/olat/core/gui/exception/_content/exception_page.html +++ b/src/main/java/org/olat/core/gui/exception/_content/exception_page.html @@ -18,7 +18,6 @@ var o_info = new Object(); <script type="text/javascript" src="$r.staticLink("js/modernizr/modernizr.js")"></script> ## 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-migrate-1.1.1.min.js")'></script> <script> /* <![CDATA[ */ jQuery.noConflict();