From 22baf1e6980de552d2c2febf5040f7ad5bf36ae9 Mon Sep 17 00:00:00 2001 From: Kim Shepherd Date: Mon, 21 May 2018 11:08:23 +1200 Subject: [PATCH] fixes for DS-3866 --- .../java/org/dspace/app/webui/jsptag/SelectEPersonTag.java | 3 ++- .../main/java/org/dspace/app/webui/jsptag/SelectGroupTag.java | 3 ++- .../src/main/webapp/dspace-admin/group-group-select.jsp | 3 ++- .../src/main/webapp/dspace-admin/supervise-confirm-remove.jsp | 2 +- dspace-jspui/src/main/webapp/dspace-admin/supervise-link.jsp | 2 +- dspace-jspui/src/main/webapp/tools/eperson-list.jsp | 2 +- dspace-jspui/src/main/webapp/tools/group-edit.jsp | 2 +- dspace-jspui/src/main/webapp/tools/group-list.jsp | 3 ++- dspace-jspui/src/main/webapp/tools/group-select-list.jsp | 2 +- 9 files changed, 13 insertions(+), 9 deletions(-) diff --git a/dspace-jspui/src/main/java/org/dspace/app/webui/jsptag/SelectEPersonTag.java b/dspace-jspui/src/main/java/org/dspace/app/webui/jsptag/SelectEPersonTag.java index 6cffdc790e..8221bcf56c 100644 --- a/dspace-jspui/src/main/java/org/dspace/app/webui/jsptag/SelectEPersonTag.java +++ b/dspace-jspui/src/main/java/org/dspace/app/webui/jsptag/SelectEPersonTag.java @@ -17,6 +17,7 @@ import javax.servlet.jsp.tagext.TagSupport; import org.apache.commons.lang.ArrayUtils; import org.dspace.eperson.EPerson; +import org.dspace.core.Utils; /** *

@@ -122,7 +123,7 @@ public class SelectEPersonTag extends TagSupport for (int i = 0; i < epeople.length; i++) { out.print(""); } diff --git a/dspace-jspui/src/main/java/org/dspace/app/webui/jsptag/SelectGroupTag.java b/dspace-jspui/src/main/java/org/dspace/app/webui/jsptag/SelectGroupTag.java index 6d04104a59..04db1b04c7 100644 --- a/dspace-jspui/src/main/java/org/dspace/app/webui/jsptag/SelectGroupTag.java +++ b/dspace-jspui/src/main/java/org/dspace/app/webui/jsptag/SelectGroupTag.java @@ -17,6 +17,7 @@ import javax.servlet.jsp.tagext.TagSupport; import org.apache.commons.lang.ArrayUtils; import org.dspace.eperson.Group; +import org.dspace.core.Utils; /** *

Tag for producing an e-person select widget in a form. Somewhat @@ -121,7 +122,7 @@ public class SelectGroupTag extends TagSupport for (int i = 0; i < groups.length; i++) { out.print(""); } } diff --git a/dspace-jspui/src/main/webapp/dspace-admin/group-group-select.jsp b/dspace-jspui/src/main/webapp/dspace-admin/group-group-select.jsp index 0ed041c0ed..cbfaff4a65 100644 --- a/dspace-jspui/src/main/webapp/dspace-admin/group-group-select.jsp +++ b/dspace-jspui/src/main/webapp/dspace-admin/group-group-select.jsp @@ -29,6 +29,7 @@ <%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %> <%@ page import="org.dspace.eperson.Group" %> +<%@ page import="org.dspace.core.Utils" %> <%@ page import="java.util.List" %> <% @@ -57,7 +58,7 @@ diff --git a/dspace-jspui/src/main/webapp/dspace-admin/supervise-confirm-remove.jsp b/dspace-jspui/src/main/webapp/dspace-admin/supervise-confirm-remove.jsp index cd6587941e..078f36039e 100644 --- a/dspace-jspui/src/main/webapp/dspace-admin/supervise-confirm-remove.jsp +++ b/dspace-jspui/src/main/webapp/dspace-admin/supervise-confirm-remove.jsp @@ -82,7 +82,7 @@

-<%= group.getName() %> +<%= Utils.addEntities(group.getName()) %>

diff --git a/dspace-jspui/src/main/webapp/dspace-admin/supervise-link.jsp b/dspace-jspui/src/main/webapp/dspace-admin/supervise-link.jsp index b09f232ee4..9b3ac4d23e 100644 --- a/dspace-jspui/src/main/webapp/dspace-admin/supervise-link.jsp +++ b/dspace-jspui/src/main/webapp/dspace-admin/supervise-link.jsp @@ -63,7 +63,7 @@ for (int i = 0; i < groups.size(); i++) { %> - + <% } %> diff --git a/dspace-jspui/src/main/webapp/tools/eperson-list.jsp b/dspace-jspui/src/main/webapp/tools/eperson-list.jsp index 8a8e8e71a8..24a99be64f 100644 --- a/dspace-jspui/src/main/webapp/tools/eperson-list.jsp +++ b/dspace-jspui/src/main/webapp/tools/eperson-list.jsp @@ -291,7 +291,7 @@ function clearEPeople() <% } - else { %><% } %>" onclick="javascript:<%= clearList %>addEPerson('<%= e.getID() %>', '<%= email %>', '<%= fullname %>');<%= closeWindow %>"/> + else { %><% } %>" onclick="javascript:<%= clearList %>addEPerson('<%= e.getID() %>', '<%= email %>', '<%= Utils.addEntities(fullname) %>');<%= closeWindow %>"/> <%= e.getID() %> <%= (e.getEmail() == null ? "" : Utils.addEntities(e.getEmail())) %> diff --git a/dspace-jspui/src/main/webapp/tools/group-edit.jsp b/dspace-jspui/src/main/webapp/tools/group-edit.jsp index 65565944f8..e08a6914a8 100644 --- a/dspace-jspui/src/main/webapp/tools/group-edit.jsp +++ b/dspace-jspui/src/main/webapp/tools/group-edit.jsp @@ -69,7 +69,7 @@ parentlink="<%= link %>" nocache="true"> -

: <%=group.getName()%> (id: <%=group.getID()%>) +

: <%=Utils.addEntities(group.getName())%> (id: <%=group.getID()%>) ">

diff --git a/dspace-jspui/src/main/webapp/tools/group-list.jsp b/dspace-jspui/src/main/webapp/tools/group-list.jsp index abd9f76c6c..2e24f21c1b 100644 --- a/dspace-jspui/src/main/webapp/tools/group-list.jsp +++ b/dspace-jspui/src/main/webapp/tools/group-list.jsp @@ -27,6 +27,7 @@ <%@ page import="org.dspace.eperson.EPerson" %> <%@ page import="org.dspace.eperson.Group" %> +<%@ page import="org.dspace.core.Utils" %> <%@ page import="java.util.List" %> <% @@ -94,7 +95,7 @@ <%= groups.get(i).getID() %> - <%= groups.get(i).getName() %> + <%= Utils.addEntities(groups.get(i).getName()) %> <% diff --git a/dspace-jspui/src/main/webapp/tools/group-select-list.jsp b/dspace-jspui/src/main/webapp/tools/group-select-list.jsp index afc283c27c..ddb055e8b5 100644 --- a/dspace-jspui/src/main/webapp/tools/group-select-list.jsp +++ b/dspace-jspui/src/main/webapp/tools/group-select-list.jsp @@ -175,7 +175,7 @@ function clearGroups() if (multiple) { %><% } else { %><% } %>" onclick="javascript:<%= clearList %>addGroup('<%= g.getID() %>', '<%= Utils.addEntities(fullname) %>');<%= closeWindow %>"/> <%= g.getID() %> - <%= g.getName()%> + <%= Utils.addEntities(g.getName())%> <% row = (row.equals("odd") ? "even" : "odd");