diff --git a/dspace/CHANGES b/dspace/CHANGES index fbb7e09d48..7163bfe68c 100644 --- a/dspace/CHANGES +++ b/dspace/CHANGES @@ -11,6 +11,7 @@ - SF patch #1589930 for SF bug #1588625 Incorrect text on item mapper screen (Scott Yeadon) +- SF bug #1596978 View unfinished submissions - collection empty - SF bug #1596952 Collection Wizard create Template missing schema - Fix bug in TableRow toString() method where NPE is thrown if tablename not set - Update DIDL license and change coding style to DSpace standard diff --git a/dspace/config/language-packs/Messages.properties b/dspace/config/language-packs/Messages.properties index 31b7501319..1a2ce50784 100644 --- a/dspace/config/language-packs/Messages.properties +++ b/dspace/config/language-packs/Messages.properties @@ -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.lang = Language 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.description = Description org.dspace.app.webui.jsptag.ItemTag.files.no = There are no files associated with this item. diff --git a/dspace/src/org/dspace/app/webui/jsptag/ItemTag.java b/dspace/src/org/dspace/app/webui/jsptag/ItemTag.java index 0a95683213..263638d49f 100644 --- a/dspace/src/org/dspace/app/webui/jsptag/ItemTag.java +++ b/dspace/src/org/dspace/app/webui/jsptag/ItemTag.java @@ -482,10 +482,18 @@ public class ItemTag extends TagSupport if (collections != null) { - out.print("" - + LocaleSupport.getLocalizedMessage(pageContext, - "org.dspace.app.webui.jsptag.ItemTag.appears") - + ""); + out.print(""); + if (item.getHandle()==null) // assume workspace item + { + 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(""); for (int i = 0; i < collections.length; i++) { diff --git a/dspace/src/org/dspace/app/webui/servlet/ViewWorkspaceItemServlet.java b/dspace/src/org/dspace/app/webui/servlet/ViewWorkspaceItemServlet.java index e1e5eb2af3..65a8592c5a 100644 --- a/dspace/src/org/dspace/app/webui/servlet/ViewWorkspaceItemServlet.java +++ b/dspace/src/org/dspace/app/webui/servlet/ViewWorkspaceItemServlet.java @@ -115,7 +115,8 @@ public class ViewWorkspaceItemServlet // get the workspace item, item and collections from the request value WorkspaceItem wsItem = WorkspaceItem.find(c, wsItemID); Item item = wsItem.getItem(); - Collection[] collections = item.getCollections(); + //Collection[] collections = item.getCollections(); + Collection[] collections = {wsItem.getCollection()}; // Ensure the user has authorisation AuthorizeManager.authorizeAction(c, item, Constants.READ);