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

Fix for bug #835847--added calls to Utils.addEntities()

Browse Source 
git-svn-id: http://scm.dspace.org/svn/repo/trunk@802 9c30dcfa-912a-0410-8fc2-9e0234be79fd
This commit is contained in:
Grace Carpenter
2004-03-23 02:12:36 +00:00
parent ddd5712ecd
commit b9c00a32ef
2 changed files with 17 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
dspace/jsp/mydspace/main.jsp
View File

@@ -61,6 +61,7 @@
<%@ page import="org.dspace.content.DCValue" %> <%@ page import="org.dspace.content.DCValue" %>
<%@ page import="org.dspace.content.Item" %> <%@ page import="org.dspace.content.Item" %>
<%@ page import="org.dspace.content.WorkspaceItem" %> <%@ page import="org.dspace.content.WorkspaceItem" %>
<%@ page import="org.dspace.core.Utils" %>
<%@ page import="org.dspace.eperson.EPerson" %> <%@ page import="org.dspace.eperson.EPerson" %>
<%@ page import="org.dspace.workflow.WorkflowItem" %> <%@ page import="org.dspace.workflow.WorkflowItem" %>
<%@ page import="org.dspace.workflow.WorkflowManager" %> <%@ page import="org.dspace.workflow.WorkflowManager" %>
@@ -144,7 +145,7 @@
} }
%> %>
</td> </td>
<td class="<%= row %>RowEvenCol"><%= title %></td> <td class="<%= row %>RowEvenCol"><%= Utils.addEntities(title) %></td>
<td class="<%= row %>RowOddCol"><%= owned[i].getCollection().getMetadata("name") %></td> <td class="<%= row %>RowOddCol"><%= owned[i].getCollection().getMetadata("name") %></td>
<td class="<%= row %>RowEvenCol"><A HREF="mailto:<%= submitter.getEmail() %>"><%= submitter.getFullName() %></A></td> <td class="<%= row %>RowEvenCol"><A HREF="mailto:<%= submitter.getEmail() %>"><%= submitter.getFullName() %></A></td>
<td class="<%= row %>RowOddCol"> <td class="<%= row %>RowOddCol">
@@ -209,7 +210,7 @@
} }
%> %>
</td> </td>
<td class="<%= row %>RowEvenCol"><%= title %></td> <td class="<%= row %>RowEvenCol"><%= Utils.addEntities(title) %></td>
<td class="<%= row %>RowOddCol"><%= pooled[i].getCollection().getMetadata("name") %></td> <td class="<%= row %>RowOddCol"><%= pooled[i].getCollection().getMetadata("name") %></td>
<td class="<%= row %>RowEvenCol"><A HREF="mailto:<%= submitter.getEmail() %>"><%= submitter.getFullName() %></A></td> <td class="<%= row %>RowEvenCol"><A HREF="mailto:<%= submitter.getEmail() %>"><%= submitter.getFullName() %></A></td>
<td class="<%= row %>RowOddCol"> <td class="<%= row %>RowOddCol">
@@ -272,7 +273,7 @@
<input type="hidden" name="step" value="<%= MyDSpaceServlet.MAIN_PAGE %>"> <input type="hidden" name="step" value="<%= MyDSpaceServlet.MAIN_PAGE %>">
<input type="hidden" name="workspace_id" value="<%= workspaceItems[i].getID() %>"> <input type="hidden" name="workspace_id" value="<%= workspaceItems[i].getID() %>">
<tr> <tr>
<td class="<%= row %>RowOddCol"><%= title %></td> <td class="<%= row %>RowOddCol"><%= Utils.addEntities(title) %></td>
<td class="<%= row %>RowEvenCol"> <td class="<%= row %>RowEvenCol">
<%= workspaceItems[i].getCollection().getMetadata("name") %> <%= workspaceItems[i].getCollection().getMetadata("name") %>
</td> </td>
@@ -317,7 +318,7 @@
<tr> <tr>
<input type="hidden" name="step" value="<%= MyDSpaceServlet.MAIN_PAGE %>"> <input type="hidden" name="step" value="<%= MyDSpaceServlet.MAIN_PAGE %>">
<input type="hidden" name="workflow_id" value="<%= workflowItems[i].getID() %>"> <input type="hidden" name="workflow_id" value="<%= workflowItems[i].getID() %>">
<td class="<%= row %>RowOddCol"><%= title %></td> <td class="<%= row %>RowOddCol"><%= Utils.addEntities(title) %></td>
<td class="<%= row %>RowEvenCol"> <td class="<%= row %>RowEvenCol">
<%= workflowItems[i].getCollection().getMetadata("name") %> <%= workflowItems[i].getCollection().getMetadata("name") %>
</td> </td>

23
dspace/jsp/submit/review.jsp
View File

@@ -58,6 +58,7 @@
<%@ page import="org.dspace.content.DCLanguage" %> <%@ page import="org.dspace.content.DCLanguage" %>
<%@ page import="org.dspace.content.DCValue" %> <%@ page import="org.dspace.content.DCValue" %>
<%@ page import="org.dspace.content.Item" %> <%@ page import="org.dspace.content.Item" %>
<%@ page import="org.dspace.core.Utils" %>
<%@ taglib uri="http://www.dspace.org/dspace-tags.tld" prefix="dspace" %> <%@ taglib uri="http://www.dspace.org/dspace-tags.tld" prefix="dspace" %>
@@ -157,7 +158,7 @@
for (int i = 0; i < authors.length; i++) for (int i = 0; i < authors.length; i++)
{ {
%> %>
<%= authors[i].value %><br> <%= Utils.addEntities(authors[i].value) %><br>
<% <%
} }
} }
@@ -175,7 +176,7 @@
<tr> <tr>
<td class=metadataFieldLabel>Title:</td> <td class=metadataFieldLabel>Title:</td>
<td class=metadataFieldValue> <td class=metadataFieldValue>
<%= title %> <%= Utils.addEntities(title) %>
</td> </td>
</tr> </tr>
<% <%
@@ -198,7 +199,7 @@
for(int i = 0; i < altTitles.length ; i++) for(int i = 0; i < altTitles.length ; i++)
{ {
%> %>
<%= altTitles[i].value %><br> <%= Utils.addEntities(altTitles[i].value) %><br>
<% <%
} }
} }
@@ -248,7 +249,7 @@
else else
{ {
%> %>
<%= publisher[0].value %> <%= Utils.addEntities(publisher[0].value) %>
<% <%
} }
%> %>
@@ -270,7 +271,7 @@
else else
{ {
%> %>
<%= citation[0].value %> <%= Utils.addEntities(citation[0].value) %>
<% <%
} }
%> %>
@@ -295,7 +296,7 @@
for (int i = 0; i < seriesNumbers.length ; i++) for (int i = 0; i < seriesNumbers.length ; i++)
{ {
%> %>
<%= seriesNumbers[i].value %><br> <%= Utils.addEntities(seriesNumbers[i].value) %><br>
<% <%
} }
} }
@@ -314,7 +315,7 @@
if (!identifiers[i].qualifier.equals("citation")) if (!identifiers[i].qualifier.equals("citation"))
{ {
%> %>
<%= identifierQualNames.get(identifiers[i].qualifier) %>: <%= identifiers[i].value %><br> <%= identifierQualNames.get(identifiers[i].qualifier) %>: <%= Utils.addEntities(identifiers[i].value) %><br>
<% <%
} }
} }
@@ -382,7 +383,7 @@
for (int i = 0; i < keywords.length; i++) for (int i = 0; i < keywords.length; i++)
{ {
%> %>
<%= keywords[i].value %><br> <%= Utils.addEntities(keywords[i].value) %><br>
<% <%
} }
} }
@@ -395,15 +396,15 @@
</tr> </tr>
<tr> <tr>
<td class=metadataFieldLabel>Abstract:</td> <td class=metadataFieldLabel>Abstract:</td>
<td class=metadataFieldValue><%= (abstr.length == 0 ? "<em>None</em>" : abstr[0].value) %></td> <td class=metadataFieldValue><%= (abstr.length == 0 ? "<em>None</em>" : Utils.addEntities(abstr[0].value)) %></td>
</tr> </tr>
<tr> <tr>
<td class=metadataFieldLabel>Sponsors:</td> <td class=metadataFieldLabel>Sponsors:</td>
<td class=metadataFieldValue><%= (sponsors.length == 0 ? "<em>None</em>" : sponsors[0].value) %></td> <td class=metadataFieldValue><%= (sponsors.length == 0 ? "<em>None</em>" : Utils.addEntities(sponsors[0].value)) %></td>
</tr> </tr>
<tr> <tr>
<td class=metadataFieldLabel>Other&nbsp;Description:</td> <td class=metadataFieldLabel>Other&nbsp;Description:</td>
<td class=metadataFieldValue><%= (otherDesc.length == 0 ? "<em>None</em>" : otherDesc[0].value) %></td> <td class=metadataFieldValue><%= (otherDesc.length == 0 ? "<em>None</em>" : Utils.addEntities(otherDesc[0].value)) %></td>
</tr> </tr>
</table> </table>
</td> </td>