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

[DS-58] Double quote problem in some fields of JSPUI (continued) - ID: 2528065

Browse Source 
git-svn-id: http://scm.dspace.org/svn/repo/branches/dspace-1_5_x@3574 9c30dcfa-912a-0410-8fc2-9e0234be79fd
This commit is contained in:
Andrea Bollini
2009-03-11 13:42:18 +00:00
parent ff0261284c
commit 8e446e0a1a
9 changed files with 31 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
dspace-jspui/dspace-jspui-webapp/src/main/webapp/dspace-admin/eperson-edit.jsp
View File

@@ -72,6 +72,7 @@
<%@ page import="org.dspace.core.I18nUtil" %>
<%@ page import="org.dspace.eperson.EPerson, org.dspace.core.ConfigurationManager" %>
<%@ page import="org.dspace.eperson.Group" %>
<%@ page import="org.dspace.core.Utils" %>
<%
EPerson eperson = (EPerson) request.getAttribute("eperson");
@@ -137,7 +138,7 @@
<%-- <td>Last Name:</td> --%>
<td><label for="tlastname"><fmt:message key="jsp.dspace-admin.eperson.general.lastname"/></label></td>
<td>
<input name="lastname" id="tlastname" size="24" value="<%=lastName == null ? "" : lastName%>"/>
<input name="lastname" id="tlastname" size="24" value="<%=lastName == null ? "" : Utils.addEntities(lastName) %>"/>
</td>
</tr>
@@ -145,7 +146,7 @@
<%-- <td>First Name:</td> --%>
<td><label for="tfirstname"><fmt:message key="jsp.dspace-admin.eperson.general.firstname"/></label></td>
<td>
<input name="firstname" id="tfirstname" size="24" value="<%=firstName == null ? "" : firstName%>"/>
<input name="firstname" id="tfirstname" size="24" value="<%=firstName == null ? "" : Utils.addEntities(firstName) %>"/>
</td>
</tr>
@@ -153,7 +154,7 @@
<tr>
<td>LDAP NetID:</td>
<td>
<input name="netid" size="24" value="<%=netid == null ? "" : netid%>" />
<input name="netid" size="24" value="<%=netid == null ? "" : Utils.addEntities(netid) %>" />
</td>
</tr>
<% } %>
@@ -162,7 +163,7 @@
<%-- <td>Phone:</td> --%>
<td><label for="tphone"><fmt:message key="jsp.dspace-admin.eperson-edit.phone"/></label></td>
<td>
<input name="phone" id="tphone" size="24" value="<%=phone == null ? "" : phone%>"/>
<input name="phone" id="tphone" size="24" value="<%=phone == null ? "" : Utils.addEntities(phone) %>"/>
</td>
</tr>
<tr>

1
dspace-jspui/dspace-jspui-webapp/src/main/webapp/register/edit-profile.jsp
View File

@@ -60,6 +60,7 @@
<%@ page import="javax.servlet.jsp.jstl.fmt.LocaleSupport" %>
<%@ page import="org.dspace.eperson.EPerson, org.dspace.core.ConfigurationManager" %>
<%@ page import="org.dspace.core.Utils" %>
<%
EPerson eperson = (EPerson) request.getAttribute("eperson");

7
dspace-jspui/dspace-jspui-webapp/src/main/webapp/register/profile-form.jsp
View File

@@ -60,6 +60,7 @@
<%@ page import="org.dspace.core.I18nUtil" %>
<%@ page import="org.dspace.app.webui.util.UIUtil" %>
<%@ page import="org.dspace.eperson.EPerson" %>
<%@ page import="org.dspace.core.Utils" %>
<%
Locale[] supportedLocales = I18nUtil.getSupportedLocales();
@@ -91,17 +92,17 @@
<tr>
<%-- <td align="right" class="standard"><strong>First name*:</strong></td> --%>
<td align="right" class="standard"><strong><fmt:message key="jsp.register.profile-form.fname.field"/></strong></td>
<td class="standard"><input type="text" name="first_name" id="tfirst_name" size="40" value="<%= firstName %>"/></td>
<td class="standard"><input type="text" name="first_name" id="tfirst_name" size="40" value="<%= Utils.addEntities(firstName) %>"/></td>
</tr>
<tr>
<%-- <td align="right" class="standard"><label for="tlast_name"><strong>Last name*:</strong></label></td> --%>
<td align="right" class="standard"><label for="tlast_name"><strong><fmt:message key="jsp.register.profile-form.lname.field"/></strong></label></td>
<td class="standard"><input type="text" name="last_name" id="tlast_name" size="40" value="<%= lastName %>" /></td>
<td class="standard"><input type="text" name="last_name" id="tlast_name" size="40" value="<%= Utils.addEntities(lastName) %>" /></td>
</tr>
<tr>
<%-- <td align="right" class="standard"><strong>Contact telephone:</strong></td> --%>
<td align="right" class="standard"><label for="tphone"><strong><fmt:message key="jsp.register.profile-form.phone.field"/></strong></label></td>
<td class="standard"><input type="text" name="phone" id="tphone" size="40" maxlength="32" value="<%= phone %>"/></td>
<td class="standard"><input type="text" name="phone" id="tphone" size="40" maxlength="32" value="<%= Utils.addEntities(phone) %>"/></td>
</tr>
<tr>
<td align="right" class="standard"><label for="tlanguage"><strong><fmt:message key="jsp.register.profile-form.language.field"/></strong></label></td>

12
dspace-jspui/dspace-jspui-webapp/src/main/webapp/tools/edit-collection.jsp
View File

@@ -164,37 +164,37 @@
<tr>
<td class="submitFormLabel"><fmt:message key="jsp.tools.edit-collection.form.label2"/></td>
<td>
<input type="text" name="short_description" value="<%= shortDesc %>" size="50"/>
<input type="text" name="short_description" value="<%= Utils.addEntities(shortDesc) %>" size="50"/>
</td>
</tr>
<tr>
<td class="submitFormLabel"><fmt:message key="jsp.tools.edit-collection.form.label3"/></td>
<td>
<textarea name="introductory_text" rows="6" cols="50"><%= intro %></textarea>
<textarea name="introductory_text" rows="6" cols="50"><%= Utils.addEntities(intro) %></textarea>
</td>
</tr>
<tr>
<td class="submitFormLabel"><fmt:message key="jsp.tools.edit-collection.form.label4"/></td>
<td>
<textarea name="copyright_text" rows="6" cols="50"><%= copy %></textarea>
<textarea name="copyright_text" rows="6" cols="50"><%= Utils.addEntities(copy) %></textarea>
</td>
</tr>
<tr>
<td class="submitFormLabel"><fmt:message key="jsp.tools.edit-collection.form.label5"/></td>
<td>
<textarea name="side_bar_text" rows="6" cols="50"><%= side %></textarea>
<textarea name="side_bar_text" rows="6" cols="50"><%= Utils.addEntities(side) %></textarea>
</td>
</tr>
<tr>
<td class="submitFormLabel"><fmt:message key="jsp.tools.edit-collection.form.label6"/></td>
<td>
<textarea name="license" rows="6" cols="50"><%= license %></textarea>
<textarea name="license" rows="6" cols="50"><%= Utils.addEntities(license) %></textarea>
</td>
</tr>
<tr>
<td class="submitFormLabel"><fmt:message key="jsp.tools.edit-collection.form.label7"/></td>
<td>
<textarea name="provenance_description" rows="6" cols="50"><%= provenance %></textarea>
<textarea name="provenance_description" rows="6" cols="50"><%= Utils.addEntities(provenance) %></textarea>
</td>
</tr>
<%-- ===========================================================

8
dspace-jspui/dspace-jspui-webapp/src/main/webapp/tools/edit-community.jsp
View File

@@ -144,25 +144,25 @@
<tr>
<td class="submitFormLabel"><fmt:message key="jsp.tools.edit-community.form.label2"/></td>
<td>
<input type="text" name="short_description" value="<%= shortDesc %>" size="50" />
<input type="text" name="short_description" value="<%= Utils.addEntities(shortDesc) %>" size="50" />
</td>
</tr>
<tr>
<td class="submitFormLabel"><fmt:message key="jsp.tools.edit-community.form.label3"/></td>
<td>
<textarea name="introductory_text" rows="6" cols="50"><%= intro %></textarea>
<textarea name="introductory_text" rows="6" cols="50"><%= Utils.addEntities(intro) %></textarea>
</td>
</tr>
<tr>
<td class="submitFormLabel"><fmt:message key="jsp.tools.edit-community.form.label4"/></td>
<td>
<textarea name="copyright_text" rows="6" cols="50"><%= copy %></textarea>
<textarea name="copyright_text" rows="6" cols="50"><%= Utils.addEntities(copy) %></textarea>
</td>
</tr>
<tr>
<td class="submitFormLabel"><fmt:message key="jsp.tools.edit-community.form.label5"/></td>
<td>
<textarea name="side_bar_text" rows="6" cols="50"><%= side %></textarea>
<textarea name="side_bar_text" rows="6" cols="50"><%= Utils.addEntities(side) %></textarea>
</td>
</tr>
<%-- ===========================================================

11
dspace-jspui/dspace-jspui-webapp/src/main/webapp/tools/edit-item-form.jsp
View File

@@ -74,6 +74,7 @@
<%@ page import="org.dspace.content.Item" %>
<%@ page import="org.dspace.core.ConfigurationManager" %>
<%@ page import="org.dspace.eperson.EPerson" %>
<%@ page import="org.dspace.core.Utils" %>
<%
Item item = (Item) request.getAttribute("item");
@@ -283,7 +284,7 @@
<td headers="t1" class="<%= row %>RowEvenCol"><%= dcv[i].element %>&nbsp;&nbsp;</td>
<td headers="t2" class="<%= row %>RowOddCol"><%= (dcv[i].qualifier == null ? "" : dcv[i].qualifier) %></td>
<td headers="t3" class="<%= row %>RowEvenCol">
<textarea name="value_<%= key %>_<%= sequenceNumber %>" rows="3" cols="50"><%= dcv[i].value %></textarea>
<textarea name="value_<%= key %>_<%= sequenceNumber %>" rows="3" cols="50"><%= Utils.addEntities(dcv[i].value) %></textarea>
</td>
<td headers="t4" class="<%= row %>RowOddCol">
<input type="text" name="language_<%= key %>_<%= sequenceNumber %>" value="<%= (dcv[i].language == null ? "" : dcv[i].language) %>" size="5"/>
@@ -383,19 +384,19 @@
<td headers="t11"> </td>
<% } %>
<td headers="t12" class="<%= row %>RowOddCol">
<input type="text" name="bitstream_name_<%= key %>" value="<%= (bitstreams[j].getName() == null ? "" : bitstreams[j].getName()) %>"/>
<input type="text" name="bitstream_name_<%= key %>" value="<%= (bitstreams[j].getName() == null ? "" : Utils.addEntities(bitstreams[j].getName())) %>"/>
</td>
<td headers="t13" class="<%= row %>RowEvenCol">
<input type="text" name="bitstream_source_<%= key %>" value="<%= (bitstreams[j].getSource() == null ? "" : bitstreams[j].getSource()) %>"/>
</td>
<td headers="t14" class="<%= row %>RowOddCol">
<input type="text" name="bitstream_description_<%= key %>" value="<%= (bitstreams[j].getDescription() == null ? "" : bitstreams[j].getDescription()) %>"/>
<input type="text" name="bitstream_description_<%= key %>" value="<%= (bitstreams[j].getDescription() == null ? "" : Utils.addEntities(bitstreams[j].getDescription())) %>"/>
</td>
<td headers="t15" class="<%= row %>RowEvenCol">
<input type="text" name="bitstream_format_id_<%= key %>" value="<%= bf.getID() %>" size="4"/> (<%= bf.getShortDescription() %>)
<input type="text" name="bitstream_format_id_<%= key %>" value="<%= bf.getID() %>" size="4"/> (<%= Utils.addEntities(bf.getShortDescription()) %>)
</td>
<td headers="t16" class="<%= row %>RowOddCol">
<input type="text" name="bitstream_user_format_description_<%= key %>" value="<%= (bitstreams[j].getUserFormatDescription() == null ? "" : bitstreams[j].getUserFormatDescription()) %>"/>
<input type="text" name="bitstream_user_format_description_<%= key %>" value="<%= (bitstreams[j].getUserFormatDescription() == null ? "" : Utils.addEntities(bitstreams[j].getUserFormatDescription())) %>"/>
</td>
<td headers="t17" class="<%= row %>RowEvenCol">
<%-- <a target="_blank" href="<%= request.getContextPath() %>/retrieve/<%= bitstreams[j].getID() %>">View</a>&nbsp;<input type="submit" name="submit_delete_bitstream_<%= key %>" value="Remove"> --%>

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

@@ -60,6 +60,7 @@
<%@ taglib uri="http://www.dspace.org/dspace-tags.tld" prefix="dspace" %>
<%@ page import="org.dspace.eperson.EPerson" %>
<%@ page import="org.dspace.core.Utils" %>
<%
int PAGESIZE = 50;
@@ -317,7 +318,7 @@ function clearEPeople()
<td headers="t1" class="<%= row %>RowOddCol">
<input 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() %>, '<%= e.getEmail() %>', '<%= fullname %>');<%= closeWindow %>"/></td>
else { %><fmt:message key="jsp.tools.general.select"/><% } %>" onclick="javascript:<%= clearList %>addEPerson(<%= e.getID() %>, '<%= e.getEmail() %>', '<%= Utils.addEntities(fullname) %>');<%= closeWindow %>"/></td>
<td headers="t2" class="<%= row %>RowEvenCol"><%= e.getID() %></td>
<td headers="t3" class="<%= row %>RowOddCol"><%= e.getEmail() %></td>
<td headers="t4" class="<%= row %>RowEvenCol">

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

@@ -61,6 +61,7 @@
<%@ page import="org.dspace.eperson.EPerson" %>
<%@ page import="org.dspace.eperson.Group" %>
<%@ page import="org.dspace.core.Utils" %>
<%
Group group = (Group) request.getAttribute("group");
@@ -90,7 +91,7 @@
<center>
<form name="epersongroup" method="post" action="">
<p><label for="tgroup_name"><fmt:message key="jsp.tools.group-edit.name"/></label><input name="group_name" id="tgroup_name" value="<%=group.getName()%>"/></p>
<p><label for="tgroup_name"><fmt:message key="jsp.tools.group-edit.name"/></label><input name="group_name" id="tgroup_name" value="<%= Utils.addEntities(group.getName()) %>"/></p>
<h3><fmt:message key="jsp.tools.group-edit.heading"/></h3>
<input type="hidden" name="group_id" value="<%=group.getID()%>"/>

1
dspace/CHANGES
View File

@@ -75,6 +75,7 @@
- [DS-1] Controlled vocab:he URL http://localhost:8080/jspui/subject-search gives internal error and a stack trace in dspace.log
- [DS-62] Not right encoding for license and extracted texts - ID: 2234532
- [DS-84] Improve API for "IgnoreAuthorization" blocks - ID: 1687783
- [DS-58] Double quote problem in some fields of JSPUI (continued) - ID: 2528065
(Paulo Jobim)
- SF Patch [2655052] Authors re-ordered when item edited (xmlui)