diff options
| author | Kseniya Tomskikh <ktomskih@datamonsters.co> | 2017-12-14 10:26:44 +0700 |
|---|---|---|
| committer | Kseniya Tomskikh <ktomskih@datamonsters.co> | 2017-12-14 10:26:44 +0700 |
| commit | ed1ad48ac9f5a03839bbe176b363af6c84220e6b (patch) | |
| tree | f6bb6ff1fc22f5d204d6e9e5f5d330d027048be1 /src/main/scala/xyz/driver/pdsuicommon | |
| parent | 7c3feb9b3bf7a1cc12e54c1d994649d03e70e14c (diff) | |
| parent | 51d5d1ddba83f539405c6d395933e1f8a456c871 (diff) | |
| download | rest-query-ed1ad48ac9f5a03839bbe176b363af6c84220e6b.tar.gz rest-query-ed1ad48ac9f5a03839bbe176b363af6c84220e6b.tar.bz2 rest-query-ed1ad48ac9f5a03839bbe176b363af6c84220e6b.zip | |
Merge branch 'master' into support-service-exceptions
Diffstat (limited to 'src/main/scala/xyz/driver/pdsuicommon')
| -rw-r--r-- | src/main/scala/xyz/driver/pdsuicommon/acl/ACL.scala | 2 | ||||
| -rw-r--r-- | src/main/scala/xyz/driver/pdsuicommon/utils/CustomSwaggerJsonFormats.scala | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/main/scala/xyz/driver/pdsuicommon/acl/ACL.scala b/src/main/scala/xyz/driver/pdsuicommon/acl/ACL.scala index 1d843e4..6987100 100644 --- a/src/main/scala/xyz/driver/pdsuicommon/acl/ACL.scala +++ b/src/main/scala/xyz/driver/pdsuicommon/acl/ACL.scala @@ -126,7 +126,7 @@ object ACL extends PhiLogging { object Trial extends BaseACL( label = "trial", - read = TcRoles + RoutesCurator + TreatmentMatchingAdmin + ResearchOncologist + AdministratorRole, + read = TcRoles ++ TreatmentMatchingRoles + ResearchOncologist + AdministratorRole, update = TcRoles ) diff --git a/src/main/scala/xyz/driver/pdsuicommon/utils/CustomSwaggerJsonFormats.scala b/src/main/scala/xyz/driver/pdsuicommon/utils/CustomSwaggerJsonFormats.scala index 62c9690..f617a20 100644 --- a/src/main/scala/xyz/driver/pdsuicommon/utils/CustomSwaggerJsonFormats.scala +++ b/src/main/scala/xyz/driver/pdsuicommon/utils/CustomSwaggerJsonFormats.scala @@ -197,7 +197,7 @@ object CustomSwaggerJsonFormats { classOf[RichPatientCriterion] -> richPatientCriterionFormat.write(nextRichPatientCriterion()), classOf[DraftPatientCriterion] -> draftPatientCriterionFormat.write(nextDraftPatientCriterion()), classOf[PatientLabelEvidenceView] -> patientLabelEvidenceWriter.write(nextPatientLabelEvidenceView()), - classOf[RichPatientEligibleTrial] -> patientEligibleTrialFormat.write(nextRichPatientEligibleTrial()), + classOf[RichPatientEligibleTrial] -> patientEligibleTrialWriter.write(nextRichPatientEligibleTrial()), classOf[PatientHypothesis] -> patientHypothesisWriter.write(nextPatientHypothesis()), classOf[PatientHistory] -> patientHistoryFormat.write(nextPatientHistory()), classOf[PatientIssue] -> patientIssueWriter.write(nextPatientIssue()), |