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

[DS-2942] Fix (template) item metadata edit

Browse Source
This commit is contained in:
KevinVdV
2015-12-10 11:27:01 +01:00
parent c7b7241c3d
commit b6d409d402
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
dspace-xmlui/src/main/java/org/dspace/app/xmlui/aspect/administrative/item/EditItemMetadataForm.java
View File

@@ -15,6 +15,7 @@ import java.util.UUID;
import org.apache.cocoon.environment.ObjectModelHelper; import org.apache.cocoon.environment.ObjectModelHelper;
import org.apache.cocoon.environment.Request; import org.apache.cocoon.environment.Request;
import org.apache.commons.lang3.StringUtils;
import org.dspace.app.xmlui.cocoon.AbstractDSpaceTransformer; import org.dspace.app.xmlui.cocoon.AbstractDSpaceTransformer;
import org.dspace.app.xmlui.wing.Message; import org.dspace.app.xmlui.wing.Message;
import org.dspace.app.xmlui.wing.WingException; import org.dspace.app.xmlui.wing.WingException;
@@ -132,11 +133,11 @@ public class EditItemMetadataForm extends AbstractDSpaceTransformer {
// Metadata editing is the only type of editing available for a template item. // Metadata editing is the only type of editing available for a template item.
boolean editingTemplateItem = false; boolean editingTemplateItem = false;
String templateCollectionID = parameters.getParameter("templateCollectionID", null); String templateCollectionID = parameters.getParameter("templateCollectionID", null);
Collection templateCollection = templateCollectionID == null ? null : collectionService.find(context, UUID.fromString(templateCollectionID)); Collection templateCollection = StringUtils.isBlank(templateCollectionID) ? null : collectionService.find(context, UUID.fromString(templateCollectionID));
if (templateCollection != null) if (templateCollection != null)
{ {
Item templateItem = templateCollection.getTemplateItem(); Item templateItem = templateCollection.getTemplateItem();
if (templateItem != null && templateItem.getID() == itemID) if (templateItem != null && templateItem.getID().equals(itemID))
{ {
editingTemplateItem = true; editingTemplateItem = true;
} }

2
dspace-xmlui/src/main/resources/aspects/Administrative/administrative.js
View File

@@ -1446,7 +1446,7 @@ function doEditItem(itemID)
} }
else if (cocoon.request.get("submit_metadata")) else if (cocoon.request.get("submit_metadata"))
{ {
doEditItemMetadata(itemID, -1); doEditItemMetadata(itemID, null);
} }
else if (cocoon.request.get("view_item")) else if (cocoon.request.get("view_item"))
{ {