hazza/DSpace
1
0
Fork 0
mirror of https://github.com/DSpace/DSpace.git synced 2025-10-17 15:03:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

fixes for DS-3866

Browse Source
This commit is contained in:
Kim Shepherd
2018-05-21 11:08:23 +12:00
parent 2904680ab0
commit 22baf1e698
9 changed files with 13 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
dspace-jspui/src/main/java/org/dspace/app/webui/jsptag/SelectEPersonTag.java
View File

@@ -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;
/**
* <p>
@@ -122,7 +123,7 @@ public class SelectEPersonTag extends TagSupport
for (int i = 0; i < epeople.length; i++)
{
out.print("<option value=\"" + epeople[i].getID() + "\">");
out.print(epeople[i].getFullName() + " ("
out.print(Utils.addEntities(epeople[i].getFullName()) + " ("
+ epeople[i].getEmail() + ")");
out.println("</option>");
}

3
dspace-jspui/src/main/java/org/dspace/app/webui/jsptag/SelectGroupTag.java
View File

@@ -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;
/**
* <P>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("<option value=\"" + groups[i].getID() + "\">");
out.print(groups[i].getName() + " (" + groups[i].getID() + ")");
out.print(Utils.addEntities(groups[i].getName()) + " (" + groups[i].getID() + ")");
out.println("</option>");
}
}

3
dspace-jspui/src/main/webapp/dspace-admin/group-group-select.jsp
View File

@@ -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 @@
<select class="form-control" size="15" name="groups_id" multiple="multiple">
<% for (int i = 0; i < groups.size(); i++) { %>
<option value="<%= groups.get(i).getID()%>">
<%= groups.get(i).getName()%>
<%= Utils.addEntities(groups.get(i).getName())%>
</option>
<% } %>
</select>

2
dspace-jspui/src/main/webapp/dspace-admin/supervise-confirm-remove.jsp
View File

@@ -82,7 +82,7 @@
<div class="row">
<label class="col-md-2"><fmt:message key="jsp.dspace-admin.supervise-confirm-remove.supervisorgroupheader"/>:</label>
<span>
<%= group.getName() %>
<%= Utils.addEntities(group.getName()) %>
</span>
</div>
<br/>

2
dspace-jspui/src/main/webapp/dspace-admin/supervise-link.jsp
View File

@@ -63,7 +63,7 @@
for (int i = 0; i < groups.size(); i++)
{
%>
<option value="<%= groups.get(i).getID() %>"><%= groups.get(i).getName() %></option>
<option value="<%= groups.get(i).getID() %>"><%= Utils.addEntities(groups.get(i).getName()) %></option>
<%
}
%>

2
dspace-jspui/src/main/webapp/tools/eperson-list.jsp
View File

@@ -291,7 +291,7 @@ function clearEPeople()
<td headers="t1">
<input class="btn btn-success" type="button" value="<%
if (multiple) { %><fmt:message key="jsp.tools.general.add"/><% }
else { %><fmt:message key="jsp.tools.general.select"/><% } %>" onclick="javascript:<%= clearList %>addEPerson('<%= e.getID() %>', '<%= email %>', '<%= fullname %>');<%= closeWindow %>"/></td>
else { %><fmt:message key="jsp.tools.general.select"/><% } %>" onclick="javascript:<%= clearList %>addEPerson('<%= e.getID() %>', '<%= email %>', '<%= Utils.addEntities(fullname) %>');<%= closeWindow %>"/></td>
<td headers="t2"><%= e.getID() %></td>
<td headers="t3"><%= (e.getEmail() == null ? "" : Utils.addEntities(e.getEmail())) %></td>
<td headers="t4">

2
dspace-jspui/src/main/webapp/tools/group-edit.jsp
View File

@@ -69,7 +69,7 @@
parentlink="<%= link %>"
nocache="true">
<h1><fmt:message key="jsp.tools.group-edit.title"/> : <%=group.getName()%> (id: <%=group.getID()%>)
<h1><fmt:message key="jsp.tools.group-edit.title"/> : <%=Utils.addEntities(group.getName())%> (id: <%=group.getID()%>)
<dspace:popup page="<%= LocaleSupport.getLocalizedMessage(pageContext, \"help.collection-admin\") +\"#groupeditor\"%>"><fmt:message key="jsp.help"/></dspace:popup>
</h1>
<form name="epersongroup" method="post" action="">

3
dspace-jspui/src/main/webapp/tools/group-list.jsp
View File

@@ -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 @@
<tr>
<td class="<%= row %>RowOddCol"><%= groups.get(i).getID() %></td>
<td class="<%= row %>RowEvenCol">
<%= groups.get(i).getName() %>
<%= Utils.addEntities(groups.get(i).getName()) %>
</td>
<td class="<%= row %>RowOddCol">
<%

2
dspace-jspui/src/main/webapp/tools/group-select-list.jsp
View File

@@ -175,7 +175,7 @@ function clearGroups()
if (multiple) { %><fmt:message key="jsp.tools.general.add"/><% }
else { %><fmt:message key="jsp.tools.general.select"/><% } %>" onclick="javascript:<%= clearList %>addGroup('<%= g.getID() %>', '<%= Utils.addEntities(fullname) %>');<%= closeWindow %>"/></td>
<td headers="t2" class=""><%= g.getID() %></td>
<td headers="t3" class=""> <%= g.getName()%></td>
<td headers="t3" class=""> <%= Utils.addEntities(g.getName())%></td>
</tr>
<%
row = (row.equals("odd") ? "even" : "odd");