From 279913b380a16eb8306ec99542b959a286194b18 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=ABl=20Kr=C3=A4hemann?= <joel.kraehemann@frentix.com>
Date: Fri, 19 Jul 2013 14:05:23 +0200
Subject: [PATCH] OO-653: added more HTML tags.
---
.../org/olat/group/FunctionalGroupTest.java | 1 +
.../java/org/olat/util/FunctionalUtil.java | 2 +-
.../xss/client/_ressources/xssClient_tags.xml | 32 +++++++++++++++++--
3 files changed, 32 insertions(+), 3 deletions(-)
diff --git a/src/test/java/org/olat/group/FunctionalGroupTest.java b/src/test/java/org/olat/group/FunctionalGroupTest.java
index 1f23abdd1c2..d3639939846 100644
--- a/src/test/java/org/olat/group/FunctionalGroupTest.java
+++ b/src/test/java/org/olat/group/FunctionalGroupTest.java
@@ -294,6 +294,7 @@ public class FunctionalGroupTest {
functionalVOUtil.addOwnerToGroup(deploymentUrl, groups[0], tutors[0]);
+ //TODO:JK: I wish there would be REST extension to configure waiting list
functionalVOUtil.setGroupConfiguration(deploymentUrl, groups[0],
new String[]{
CollaborationTools.TOOL_CALENDAR,
diff --git a/src/test/java/org/olat/util/FunctionalUtil.java b/src/test/java/org/olat/util/FunctionalUtil.java
index d4a9a9cc58e..50437c92e2e 100644
--- a/src/test/java/org/olat/util/FunctionalUtil.java
+++ b/src/test/java/org/olat/util/FunctionalUtil.java
@@ -48,7 +48,7 @@ public class FunctionalUtil {
public final static String ACKNOWLEDGE_CHECKBOX = "acknowledge_checkbox";
public final static long TIMEOUT = 20000;
- public final static long POLL_INTERVAL = 200;
+ public final static long POLL_INTERVAL = 3000;
public enum WaitLimitAttribute {
NORMAL("10000"),
diff --git a/src/test/java/org/olat/util/xss/client/_ressources/xssClient_tags.xml b/src/test/java/org/olat/util/xss/client/_ressources/xssClient_tags.xml
index 5c7b91dfcd7..68030b1d30f 100644
--- a/src/test/java/org/olat/util/xss/client/_ressources/xssClient_tags.xml
+++ b/src/test/java/org/olat/util/xss/client/_ressources/xssClient_tags.xml
@@ -4,7 +4,9 @@
<tag name="html"/>
<tag name="head"/>
<tag name="meta"/>
- <tag name="body"/>
+ <tag name="body">
+ <attribute name="onload"/>
+ </tag>
<!-- formating tags -->
<tag name="h1"/>
@@ -24,18 +26,32 @@
<tag name="tbody"/>
<tag name="td">
<attribute name="align"/>
- <attribute name="valing"/>
+ <attribute name="valign"/>
<attribute name="colspan"/>
<attribute name="rowspan"/>
</tag>
+ <tag name="col"/>
+ <tag name="colgroup"/>
+ <tag name="tfoot"/>
<tag name="div"/>
<tag name="a">
<attribute name="href"/>
</tag>
+ <tag name="ol"/>
+ <tag name="ul"/>
+ <tag name="li"/>
+ <tag name="address"/>
+ <tag name="hr"/>
+ <tag name="pre"/>
+ <tag name="code"/>
+ <tag name="dd"/>
+ <tag name="dt"/>
+ <tag name="textarea"/>
<!-- embedding external -->
<tag name="img">
<attribute name="src"/>
+ <attribute nama="alt"/>
</tag>
<tag name="script"/>
<tag name="object"/>
@@ -47,5 +63,17 @@
<tag name="i"/>
<tag name="b"/>
<tag name="u"/>
+ <tag name="s"/>
<tag name="span"/>
+ <tag name="blockquote"/>
+ <tag name="br"/>
+ <tag name="small"/>
+ <tag name="big"/>
+ <tag name="sub"/>
+ <tag name="sup"/>
+ <tag name="em"/>
+ <tag name="q"/>
+ <tag name="label"/>
+ <tag name="option"/>
+ <tag name="select"/>
</list>
--
GitLab