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

Merge pull request #692 from rivaldi8/DS-2186-request-item-copy-strategy

Browse Source 
[DS-2186] Request item copy doesn't always use RequestItemAuthorExtractor
This commit is contained in:
Andrea Schweer
2015-05-15 16:36:45 +12:00
parent 5a520f17d8 f54a8a9a4b
commit d457048836
2 changed files with 24 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
dspace-xmlui/src/main/java/org/dspace/app/xmlui/aspect/artifactbrowser/ItemRequestResponseFalseForm.java
View File

@@ -11,7 +11,6 @@ import java.io.IOException;
import java.io.Serializable; import java.io.Serializable;
import java.sql.SQLException; import java.sql.SQLException;
import java.text.MessageFormat; import java.text.MessageFormat;
import org.apache.cocoon.caching.CacheableProcessingComponent; import org.apache.cocoon.caching.CacheableProcessingComponent;
import org.apache.cocoon.environment.ObjectModelHelper; import org.apache.cocoon.environment.ObjectModelHelper;
import org.apache.cocoon.environment.Request; import org.apache.cocoon.environment.Request;
@@ -19,6 +18,8 @@ import org.apache.cocoon.util.HashUtil;
import org.apache.excalibur.source.SourceValidity; import org.apache.excalibur.source.SourceValidity;
import org.apache.excalibur.source.impl.validity.NOPValidity; import org.apache.excalibur.source.impl.validity.NOPValidity;
import org.dspace.app.requestitem.RequestItem; import org.dspace.app.requestitem.RequestItem;
import org.dspace.app.requestitem.RequestItemAuthor;
import org.dspace.app.requestitem.RequestItemAuthorExtractor;
import org.dspace.app.xmlui.cocoon.AbstractDSpaceTransformer; import org.dspace.app.xmlui.cocoon.AbstractDSpaceTransformer;
import org.dspace.app.xmlui.utils.ContextUtil; import org.dspace.app.xmlui.utils.ContextUtil;
import org.dspace.app.xmlui.utils.HandleUtil; import org.dspace.app.xmlui.utils.HandleUtil;
@@ -40,6 +41,7 @@ import org.dspace.core.Context;
import org.dspace.core.I18nUtil; import org.dspace.core.I18nUtil;
import org.dspace.eperson.EPerson; import org.dspace.eperson.EPerson;
import org.dspace.handle.HandleManager; import org.dspace.handle.HandleManager;
import org.dspace.utils.DSpace;
import org.xml.sax.SAXException; import org.xml.sax.SAXException;
/** /**
@@ -126,14 +128,18 @@ public class ItemRequestResponseFalseForm extends AbstractDSpaceTransformer impl
else else
title = "untitled"; title = "untitled";
EPerson submitter = item.getSubmitter(); RequestItemAuthor author = new DSpace()
.getServiceManager()
.getServiceByName(RequestItemAuthorExtractor.class.getName(),
RequestItemAuthorExtractor.class)
.getRequestItemAuthor(context, item);
Object[] args = new String[]{ Object[] args = new String[]{
requestItem.getReqName(), requestItem.getReqName(), // User
HandleManager.getCanonicalForm(item.getHandle()), // User HandleManager.getCanonicalForm(item.getHandle()), // URL
title, // request item title title, // request item title
submitter.getFullName(), // # submmiter name author.getFullName(),
submitter.getEmail() // # submmiter email author.getEmail()
}; };
String subject = I18nUtil.getMessage("itemRequest.response.subject.reject", context); String subject = I18nUtil.getMessage("itemRequest.response.subject.reject", context);

18
dspace-xmlui/src/main/java/org/dspace/app/xmlui/aspect/artifactbrowser/ItemRequestResponseTrueForm.java
View File

@@ -11,7 +11,6 @@ import java.io.IOException;
import java.io.Serializable; import java.io.Serializable;
import java.sql.SQLException; import java.sql.SQLException;
import java.text.MessageFormat; import java.text.MessageFormat;
import org.apache.cocoon.caching.CacheableProcessingComponent; import org.apache.cocoon.caching.CacheableProcessingComponent;
import org.apache.cocoon.environment.ObjectModelHelper; import org.apache.cocoon.environment.ObjectModelHelper;
import org.apache.cocoon.environment.Request; import org.apache.cocoon.environment.Request;
@@ -19,6 +18,8 @@ import org.apache.cocoon.util.HashUtil;
import org.apache.excalibur.source.SourceValidity; import org.apache.excalibur.source.SourceValidity;
import org.apache.excalibur.source.impl.validity.NOPValidity; import org.apache.excalibur.source.impl.validity.NOPValidity;
import org.dspace.app.requestitem.RequestItem; import org.dspace.app.requestitem.RequestItem;
import org.dspace.app.requestitem.RequestItemAuthor;
import org.dspace.app.requestitem.RequestItemAuthorExtractor;
import org.dspace.app.xmlui.cocoon.AbstractDSpaceTransformer; import org.dspace.app.xmlui.cocoon.AbstractDSpaceTransformer;
import org.dspace.app.xmlui.utils.ContextUtil; import org.dspace.app.xmlui.utils.ContextUtil;
import org.dspace.app.xmlui.utils.UIException; import org.dspace.app.xmlui.utils.UIException;
@@ -39,6 +40,7 @@ import org.dspace.eperson.EPerson;
import org.dspace.handle.HandleManager; import org.dspace.handle.HandleManager;
import org.dspace.storage.rdbms.DatabaseManager; import org.dspace.storage.rdbms.DatabaseManager;
import org.dspace.storage.rdbms.TableRow; import org.dspace.storage.rdbms.TableRow;
import org.dspace.utils.DSpace;
import org.xml.sax.SAXException; import org.xml.sax.SAXException;
/** /**
@@ -125,14 +127,18 @@ public class ItemRequestResponseTrueForm extends AbstractDSpaceTransformer imple
else else
title = "untitled"; title = "untitled";
EPerson submitter = item.getSubmitter(); RequestItemAuthor author = new DSpace()
.getServiceManager()
.getServiceByName(RequestItemAuthorExtractor.class.getName(),
RequestItemAuthorExtractor.class)
.getRequestItemAuthor(context, item);
Object[] args = new String[]{ Object[] args = new String[]{
requestItem.getReqName(), requestItem.getReqName(), // User
HandleManager.getCanonicalForm(item.getHandle()), // User HandleManager.getCanonicalForm(item.getHandle()), // URL
title, // request item title title, // request item title
submitter.getFullName(), // # submmiter name author.getFullName(),
submitter.getEmail() // # submmiter email author.getEmail()
}; };
String subject = I18nUtil.getMessage("itemRequest.response.subject.approve", context); String subject = I18nUtil.getMessage("itemRequest.response.subject.approve", context);