SF bug #1596978 View unfinished submissions - collection empty

git-svn-id: http://scm.dspace.org/svn/repo/trunk@1694 9c30dcfa-912a-0410-8fc2-9e0234be79fd
This commit is contained in:
Scott Yeadon
2006-11-28 04:15:35 +00:00
parent 5431dcd0b0
commit c001b05d05
4 changed files with 16 additions and 5 deletions

View File

@@ -11,6 +11,7 @@
- SF patch #1589930 for SF bug #1588625 Incorrect text on item mapper screen - SF patch #1589930 for SF bug #1588625 Incorrect text on item mapper screen
(Scott Yeadon) (Scott Yeadon)
- SF bug #1596978 View unfinished submissions - collection empty
- SF bug #1596952 Collection Wizard create Template missing schema - SF bug #1596952 Collection Wizard create Template missing schema
- Fix bug in TableRow toString() method where NPE is thrown if tablename not set - Fix bug in TableRow toString() method where NPE is thrown if tablename not set
- Update DIDL license and change coding style to DSpace standard - Update DIDL license and change coding style to DSpace standard

View File

@@ -1318,6 +1318,7 @@ org.dspace.app.webui.jsptag.ItemTag.dcfield = DC Field
org.dspace.app.webui.jsptag.ItemTag.value = Value org.dspace.app.webui.jsptag.ItemTag.value = Value
org.dspace.app.webui.jsptag.ItemTag.lang = Language org.dspace.app.webui.jsptag.ItemTag.lang = Language
org.dspace.app.webui.jsptag.ItemTag.appears = Appears in Collections: org.dspace.app.webui.jsptag.ItemTag.appears = Appears in Collections:
org.dspace.app.webui.jsptag.ItemTag.submitted = Submitted to Collection:
org.dspace.app.webui.jsptag.ItemTag.files = Files in This Item: org.dspace.app.webui.jsptag.ItemTag.files = Files in This Item:
org.dspace.app.webui.jsptag.ItemTag.description = Description org.dspace.app.webui.jsptag.ItemTag.description = Description
org.dspace.app.webui.jsptag.ItemTag.files.no = There are no files associated with this item. org.dspace.app.webui.jsptag.ItemTag.files.no = There are no files associated with this item.

View File

@@ -482,10 +482,18 @@ public class ItemTag extends TagSupport
if (collections != null) if (collections != null)
{ {
out.print("<tr><td class=\"metadataFieldLabel\">" out.print("<tr><td class=\"metadataFieldLabel\">");
+ LocaleSupport.getLocalizedMessage(pageContext, if (item.getHandle()==null) // assume workspace item
"org.dspace.app.webui.jsptag.ItemTag.appears") {
+ "</td><td class=\"metadataFieldValue\">"); out.print(LocaleSupport.getLocalizedMessage(pageContext,
"org.dspace.app.webui.jsptag.ItemTag.submitted"));
}
else
{
out.print(LocaleSupport.getLocalizedMessage(pageContext,
"org.dspace.app.webui.jsptag.ItemTag.appears"));
}
out.print("</td><td class=\"metadataFieldValue\">");
for (int i = 0; i < collections.length; i++) for (int i = 0; i < collections.length; i++)
{ {

View File

@@ -115,7 +115,8 @@ public class ViewWorkspaceItemServlet
// get the workspace item, item and collections from the request value // get the workspace item, item and collections from the request value
WorkspaceItem wsItem = WorkspaceItem.find(c, wsItemID); WorkspaceItem wsItem = WorkspaceItem.find(c, wsItemID);
Item item = wsItem.getItem(); Item item = wsItem.getItem();
Collection[] collections = item.getCollections(); //Collection[] collections = item.getCollections();
Collection[] collections = {wsItem.getCollection()};
// Ensure the user has authorisation // Ensure the user has authorisation
AuthorizeManager.authorizeAction(c, item, Constants.READ); AuthorizeManager.authorizeAction(c, item, Constants.READ);