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

OO-875: remove double escaping in groups portlet

parent 679c6f81
No related branches found
No related tags found
No related merge requests found
...@@ -35,7 +35,6 @@ import java.util.List; ...@@ -35,7 +35,6 @@ import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Set; import java.util.Set;
import org.apache.commons.lang.StringEscapeUtils;
import org.olat.NewControllerFactory; import org.olat.NewControllerFactory;
import org.olat.core.CoreSpringFactory; import org.olat.core.CoreSpringFactory;
import org.olat.core.gui.UserRequest; import org.olat.core.gui.UserRequest;
...@@ -317,7 +316,8 @@ public class GroupsPortletRunController extends AbstractPortletRunController<Bus ...@@ -317,7 +316,8 @@ public class GroupsPortletRunController extends AbstractPortletRunController<Bus
return -comparisonResult; return -comparisonResult;
} }
return comparisonResult; return comparisonResult;
}}; }
};
} }
/** /**
...@@ -328,7 +328,7 @@ public class GroupsPortletRunController extends AbstractPortletRunController<Bus ...@@ -328,7 +328,7 @@ public class GroupsPortletRunController extends AbstractPortletRunController<Bus
* Initial Date: 10.12.2007 <br> * Initial Date: 10.12.2007 <br>
* @author Lavinia Dumitrescu * @author Lavinia Dumitrescu
*/ */
private class GroupTableDataModel extends PortletDefaultTableDataModel<BusinessGroupEntry> { private static class GroupTableDataModel extends PortletDefaultTableDataModel<BusinessGroupEntry> {
public GroupTableDataModel(List<PortletEntry<BusinessGroupEntry>> objects) { public GroupTableDataModel(List<PortletEntry<BusinessGroupEntry>> objects) {
super(objects, 1); super(objects, 1);
} }
...@@ -338,9 +338,7 @@ public class GroupsPortletRunController extends AbstractPortletRunController<Bus ...@@ -338,9 +338,7 @@ public class GroupsPortletRunController extends AbstractPortletRunController<Bus
BusinessGroupEntry businessGroup = entry.getValue(); BusinessGroupEntry businessGroup = entry.getValue();
switch (col) { switch (col) {
case 0: case 0:
String name = businessGroup.getName(); return businessGroup.getName();
name = StringEscapeUtils.escapeHtml(name).toString();
return name;
default: default:
return "ERROR"; return "ERROR";
} }
...@@ -360,7 +358,7 @@ public class GroupsPortletRunController extends AbstractPortletRunController<Bus ...@@ -360,7 +358,7 @@ public class GroupsPortletRunController extends AbstractPortletRunController<Bus
* Initial Date: 10.12.2007 <br> * Initial Date: 10.12.2007 <br>
* @author Lavinia Dumitrescu * @author Lavinia Dumitrescu
*/ */
private class GroupsManualSortingTableDataModel extends PortletDefaultTableDataModel<BusinessGroupEntry> { private static class GroupsManualSortingTableDataModel extends PortletDefaultTableDataModel<BusinessGroupEntry> {
/** /**
* @param objects * @param objects
* @param locale * @param locale
...@@ -396,7 +394,7 @@ public class GroupsPortletRunController extends AbstractPortletRunController<Bus ...@@ -396,7 +394,7 @@ public class GroupsPortletRunController extends AbstractPortletRunController<Bus
} }
} }
private class GroupPortletEntry implements PortletEntry<BusinessGroupEntry> { private static class GroupPortletEntry implements PortletEntry<BusinessGroupEntry> {
private BusinessGroupEntry value; private BusinessGroupEntry value;
private Long key; private Long key;
......
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