From bc374855a1cc300a07344955c0b89bb816240b47 Mon Sep 17 00:00:00 2001
From: srosse <none@none>
Date: Mon, 8 Jul 2013 15:53:57 +0200
Subject: [PATCH] OO-531: fix issue with the group search in the user import
---
.../org/olat/admin/user/groups/GroupSearchController.java | 6 ++++--
.../olat/core/gui/exception/_content/exception_page.html | 1 -
2 files changed, 4 insertions(+), 3 deletions(-)
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 4b1b9ae0133..ca6ede70469 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 20412ae3788..925fa9828a9 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();
--
GitLab