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

(Stuart Lewis)

Browse Source 
SF patch #1556950  for SF bug #1556947 NPE when no user selected to del/edit


git-svn-id: http://scm.dspace.org/svn/repo/trunk@1610 9c30dcfa-912a-0410-8fc2-9e0234be79fd
This commit is contained in:
Claudia Juergen
2006-09-12 13:17:10 +00:00
parent e52be55eb0
commit b3a83a0181
4 changed files with 48 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
dspace/CHANGES
View File

@@ -21,6 +21,7 @@
- SF patch #1541383 Browse-by-date and browse-by-title not working
- SF patch #1548020 robots.txt to limit bots navigating browse by subject
- SF patch #1556183 Missing title for news editor page
- SF patch #1556950 for SF bug #1556947 NPE when no user selected to del/edit
(Mark Diggory)
- SF patch #1523824 robots.txt to limit bots navigating author and date pages

1
dspace/config/language-packs/Messages.properties
View File

@@ -281,6 +281,7 @@ jsp.dspace-admin.eperson-main.heading = Administer EPeople
jsp.dspace-admin.eperson-main.or = OR
jsp.dspace-admin.eperson-main.then = then
jsp.dspace-admin.eperson-main.title = EPerson Administrations
jsp.dspace-admin.eperson-main.noepersonselected = No EPerson selected!
jsp.dspace-admin.group-eperson-select.add = Add EPerson
jsp.dspace-admin.group-eperson-select.heading = Select EPerson to Add to Group {0}

13
dspace/jsp/dspace-admin/eperson-main.jsp
View File

@@ -38,7 +38,8 @@
- main page for eperson admin
-
- Attributes:
- none
- no_eperson_selected - if a user tries to edit or delete an EPerson without
- first selecting one
-
- Returns:
- submit_add - admin wants to add an eperson
@@ -54,6 +55,10 @@
<%@ taglib uri="http://www.dspace.org/dspace-tags.tld" prefix="dspace" %>
<%
boolean noEPersonSelected = (request.getAttribute("no_eperson_selected") != null);
%>
<dspace:layout titlekey="jsp.dspace-admin.eperson-main.title"
navbar="admin"
locbar="link"
@@ -73,6 +78,12 @@
</td>
</tr>
</table>
<% if (noEPersonSelected)
{ %><p><strong>
<fmt:message key="jsp.dspace-admin.eperson-main.noepersonselected"/>
</strong></p>
<% } %>
<form method="post" action="">

50
dspace/src/org/dspace/app/webui/servlet/admin/EPersonAdminServlet.java
View File

@@ -101,17 +101,26 @@ public class EPersonAdminServlet extends DSpaceServlet
// edit an eperson
EPerson e = EPerson.find(context, UIUtil.getIntParameter(request,
"eperson_id"));
// what groups is this person a member of?
Group[] groupMemberships = Group.allMemberGroups(context, e);
request.setAttribute("eperson", e);
request.setAttribute("group.memberships", groupMemberships);
JSPManager.showJSP(request, response,
"/dspace-admin/eperson-edit.jsp");
context.complete();
// Check the EPerson exists
if (e == null)
{
request.setAttribute("no_eperson_selected", new Boolean(true));
showMain(context, request, response);
}
else
{
// what groups is this person a member of?
Group[] groupMemberships = Group.allMemberGroups(context, e);
request.setAttribute("eperson", e);
request.setAttribute("group.memberships", groupMemberships);
JSPManager.showJSP(request, response,
"/dspace-admin/eperson-edit.jsp");
context.complete();
}
}
else if (button.equals("submit_save"))
{
@@ -227,11 +236,20 @@ public class EPersonAdminServlet extends DSpaceServlet
// Start delete process - go through verification step
EPerson e = EPerson.find(context, UIUtil.getIntParameter(request,
"eperson_id"));
request.setAttribute("eperson", e);
JSPManager.showJSP(request, response,
"/dspace-admin/eperson-confirm-delete.jsp");
// Check the EPerson exists
if (e == null)
{
request.setAttribute("no_eperson_selected", new Boolean(true));
showMain(context, request, response);
}
else
{
request.setAttribute("eperson", e);
JSPManager.showJSP(request, response,
"/dspace-admin/eperson-confirm-delete.jsp");
}
}
else if (button.equals("submit_confirm_delete"))
{