diff --git a/coeus-impl/src/main/java/org/kuali/kra/irb/ProtocolOnlineReviewDocument.java b/coeus-impl/src/main/java/org/kuali/kra/irb/ProtocolOnlineReviewDocument.java index fbb0b360569..773a3df67d4 100644 --- a/coeus-impl/src/main/java/org/kuali/kra/irb/ProtocolOnlineReviewDocument.java +++ b/coeus-impl/src/main/java/org/kuali/kra/irb/ProtocolOnlineReviewDocument.java @@ -75,7 +75,7 @@ public class ProtocolOnlineReviewDocument extends ProtocolOnlineReviewDocumentB public ProtocolOnlineReviewDocument() { super(); - protocolOnlineReviewList = new ArrayList(); + protocolOnlineReviewList = new ArrayList<>(); ProtocolOnlineReview newProtocolReview = new ProtocolOnlineReview(); newProtocolReview.setProtocolOnlineReviewDocument(this); protocolOnlineReviewList.add(newProtocolReview); @@ -149,10 +149,7 @@ public List buildListOfDeletionAwareLists() { @Override protected List getAllRolePersons() { - KcAuthorizationService kraAuthService = - (KcAuthorizationService) KcServiceLocator.getService(KcAuthorizationService.class); - //return kraAuthService.getAllRolePersons(getProtocolOnlineReview()); - return new ArrayList(); + return new ArrayList<>(); } public String getDocumentTypeCode() { diff --git a/coeus-impl/src/main/java/org/kuali/kra/irb/onlinereview/ProtocolOnlineReviewServiceImpl.java b/coeus-impl/src/main/java/org/kuali/kra/irb/onlinereview/ProtocolOnlineReviewServiceImpl.java index 682b4790308..edffb617634 100644 --- a/coeus-impl/src/main/java/org/kuali/kra/irb/onlinereview/ProtocolOnlineReviewServiceImpl.java +++ b/coeus-impl/src/main/java/org/kuali/kra/irb/onlinereview/ProtocolOnlineReviewServiceImpl.java @@ -49,11 +49,12 @@ public class ProtocolOnlineReviewServiceImpl extends ProtocolOnlineReviewService @Override public boolean isProtocolInStateToBeReviewed(ProtocolBase protocol) { boolean isReviewable = false; - ProtocolSubmission submission = (ProtocolSubmission)((Protocol) protocol).getProtocolSubmission(); + ProtocolSubmission submission = ((Protocol) protocol).getProtocolSubmission(); if (submission != null) { try { isReviewable = StringUtils.isNotEmpty(submission.getScheduleId()) || ProtocolReviewType.EXPEDITED_REVIEW_TYPE_CODE.equals(submission.getProtocolReviewTypeCode()) + || ProtocolReviewType.EXEMPT_STUDIES_REVIEW_TYPE_CODE.equals(submission.getProtocolReviewTypeCode()) || (ProtocolReviewType.FYI_TYPE_CODE.equalsIgnoreCase(submission.getProtocolReviewTypeCode()) && ProtocolSubmissionType.NOTIFY_IRB.equalsIgnoreCase(submission.getProtocolSubmissionType().getSubmissionTypeCode())); isReviewable &= (StringUtils.equals(submission.getSubmissionStatusCode(), ProtocolSubmissionStatus.SUBMITTED_TO_COMMITTEE) diff --git a/coeus-webapp/src/main/webapp/WEB-INF/tags/irb/action/modifySubmissionAction.tag b/coeus-webapp/src/main/webapp/WEB-INF/tags/irb/action/modifySubmissionAction.tag index f7455e42103..04e0706302f 100644 --- a/coeus-webapp/src/main/webapp/WEB-INF/tags/irb/action/modifySubmissionAction.tag +++ b/coeus-webapp/src/main/webapp/WEB-INF/tags/irb/action/modifySubmissionAction.tag @@ -22,7 +22,6 @@ -<%-- --%> diff --git a/coeus-webapp/src/main/webapp/scripts/kuali_application.js b/coeus-webapp/src/main/webapp/scripts/kuali_application.js index f8484467b3a..e8f0c0308f7 100644 --- a/coeus-webapp/src/main/webapp/scripts/kuali_application.js +++ b/coeus-webapp/src/main/webapp/scripts/kuali_application.js @@ -1810,7 +1810,7 @@ function displayReviewers(protocolId) { var protocolReviewTypeCode = dwr.util.getValue('actionHelper.protocolSubmitAction.protocolReviewTypeCode'); // we suppress the reviewer display if a committee is not selected, or if a schedule is not selected in case of a non-expedited review type - if ( ((scheduleId === "") && (protocolReviewTypeCode != '2')) || (committeeId === "") ) { + if ( ((scheduleId === "") && (protocolReviewTypeCode != '2' && protocolReviewTypeCode != '3')) || (committeeId === "") ) { document.getElementById("reviewers").style.display = 'none'; } else {