hazza/DSpace
1
0
Fork 0
mirror of https://github.com/DSpace/DSpace.git synced 2025-10-12 20:43:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into DS-3179-jspui-remove-file

Browse Source 
Conflicts:
	dspace-api/src/main/java/org/dspace/content/ItemServiceImpl.java
This commit is contained in:
philip Vissenaekens
2016-06-20 15:48:12 +02:00
parent 5ebaf76eea 764070205d
commit b1e4d3980b
671 changed files with 11528 additions and 7483 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
dspace-api/src/main/java/org/dspace/content/CollectionServiceImpl.java
View File

@@ -23,6 +23,8 @@ import org.dspace.eperson.Group;
import org.dspace.eperson.service.GroupService;
import org.dspace.eperson.service.SubscribeService;
import org.dspace.event.Event;
import org.dspace.harvest.HarvestedCollection;
import org.dspace.harvest.service.HarvestedCollectionService;
import org.dspace.workflow.factory.WorkflowServiceFactory;
import org.springframework.beans.factory.annotation.Autowired;
@@ -63,6 +65,8 @@ public class CollectionServiceImpl extends DSpaceObjectServiceImpl<Collection> i
protected SubscribeService subscribeService;
@Autowired(required = true)
protected WorkspaceItemService workspaceItemService;
@Autowired(required=true)
protected HarvestedCollectionService harvestedCollectionService;
protected CollectionServiceImpl()
@@ -635,6 +639,13 @@ public class CollectionServiceImpl extends DSpaceObjectServiceImpl<Collection> i
log.info(LogManager.getHeader(context, "delete_collection",
"collection_id=" + collection.getID()));
// remove harvested collections.
HarvestedCollection hc = harvestedCollectionService.find(context,collection);
if(hc!=null)
{
harvestedCollectionService.delete(context, hc);
}
context.addEvent(new Event(Event.DELETE, Constants.COLLECTION,
collection.getID(), collection.getHandle(), getIdentifiers(context, collection)));
@@ -725,8 +736,6 @@ public class CollectionServiceImpl extends DSpaceObjectServiceImpl<Collection> i
groupService.delete(context, g);
}
deleteMetadata(context, collection);
Iterator<Community> owningCommunities = collection.getCommunities().iterator();
while (owningCommunities.hasNext())
{