Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
OLAT CI-CD Testing Project
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Requirements
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Deploy
Package Registry
Container Registry
Model registry
Operate
Terraform modules
Monitor
Service Desk
Analyze
Contributor analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Lars Oliver Dam
OLAT CI-CD Testing Project
Commits
62069379
Commit
62069379
authored
11 years ago
by
srosse
Browse files
Options
Downloads
Patches
Plain Diff
OO-875: remove double escaping in groups portlet
parent
679c6f81
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
src/main/java/org/olat/group/ui/portlet/GroupsPortletRunController.java
+6
-8
6 additions, 8 deletions
...org/olat/group/ui/portlet/GroupsPortletRunController.java
with
6 additions
and
8 deletions
src/main/java/org/olat/group/ui/portlet/GroupsPortletRunController.java
+
6
−
8
View file @
62069379
...
@@ -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
;
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment