hazza/DSpace
1
0
Fork 0
mirror of https://github.com/DSpace/DSpace.git synced 2025-10-14 05:23:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

DS-1814 fix merge

Browse Source
This commit is contained in:
Luigi Andrea Pascarelli
2016-08-24 18:29:23 +02:00
parent a017c7ad82
commit 0d3c7a586a
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
dspace-api/src/main/java/org/dspace/content/ItemServiceImpl.java
View File

@@ -35,6 +35,7 @@ import org.dspace.content.service.CommunityService;
import org.dspace.content.service.InstallItemService; import org.dspace.content.service.InstallItemService;
import org.dspace.content.service.ItemService; import org.dspace.content.service.ItemService;
import org.dspace.content.service.MetadataSchemaService; import org.dspace.content.service.MetadataSchemaService;
import org.dspace.content.service.WorkspaceItemService;
import org.dspace.core.Constants; import org.dspace.core.Constants;
import org.dspace.core.Context; import org.dspace.core.Context;
import org.dspace.core.LogManager; import org.dspace.core.LogManager;
@@ -929,9 +930,6 @@ prevent the generation of resource policy entry values with null dspace_object a
*/ */
@Override
/** /**
* Add the default policies, which have not been already added to the given DSpace object * Add the default policies, which have not been already added to the given DSpace object
* *
@@ -1230,6 +1228,7 @@ prevent the generation of resource policy entry values with null dspace_object a
return itemDAO.countItems(context, false, true); return itemDAO.countItems(context, false, true);
} }
@Override
public boolean canCreateNewVersion(Context context, Item item) throws SQLException{ public boolean canCreateNewVersion(Context context, Item item) throws SQLException{
if (authorizeService.isAdmin(context, item)) if (authorizeService.isAdmin(context, item))
{ {