aboutsummaryrefslogtreecommitdiff
path: root/src/main/scala/xyz/driver/pdsuicommon
diff options
context:
space:
mode:
authorKseniya Tomskikh <ktomskih@datamonsters.co>2017-10-23 15:50:10 +0700
committerKseniya Tomskikh <ktomskih@datamonsters.co>2017-10-23 15:50:10 +0700
commit683bf697e0f6844202f7e61eea0ef67498ed6260 (patch)
treefda3422f7e0dca72d70710bb8e46dff3d6970ae1 /src/main/scala/xyz/driver/pdsuicommon
parente9f8fbb7f8f379e6885331c94364f6e7d41ffbb2 (diff)
parentd1537fa8bbf7c7097fe7ddb410e40c82381d79f2 (diff)
downloadrest-query-683bf697e0f6844202f7e61eea0ef67498ed6260.tar.gz
rest-query-683bf697e0f6844202f7e61eea0ef67498ed6260.tar.bz2
rest-query-683bf697e0f6844202f7e61eea0ef67498ed6260.zip
Merge branch 'master' of github.com:drivergroup/pds-ui-commonv0.10.3v0.10.2
Diffstat (limited to 'src/main/scala/xyz/driver/pdsuicommon')
-rw-r--r--src/main/scala/xyz/driver/pdsuicommon/acl/ACL.scala4
-rw-r--r--src/main/scala/xyz/driver/pdsuicommon/http/Directives.scala3
2 files changed, 5 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 180ebf9..3eb1a65 100644
--- a/src/main/scala/xyz/driver/pdsuicommon/acl/ACL.scala
+++ b/src/main/scala/xyz/driver/pdsuicommon/acl/ACL.scala
@@ -144,7 +144,9 @@ object ACL extends PhiLogging {
object Hypothesis
extends BaseACL(
label = "hypothesis",
- read = Set(TrialSummarizer, TrialAdmin) ++ TreatmentMatchingRoles
+ read = Set(TrialSummarizer, TrialAdmin) ++ TreatmentMatchingRoles,
+ create = Set(TrialAdmin),
+ delete = Set(TrialAdmin)
)
object Criterion
diff --git a/src/main/scala/xyz/driver/pdsuicommon/http/Directives.scala b/src/main/scala/xyz/driver/pdsuicommon/http/Directives.scala
index e9a4132..67da717 100644
--- a/src/main/scala/xyz/driver/pdsuicommon/http/Directives.scala
+++ b/src/main/scala/xyz/driver/pdsuicommon/http/Directives.scala
@@ -3,6 +3,7 @@ package xyz.driver.pdsuicommon.http
import akka.http.scaladsl.server._
import akka.http.scaladsl.server.Directives._
import akka.http.scaladsl.model._
+import xyz.driver.core.app.DriverApp
import xyz.driver.core.rest.ContextHeaders
import xyz.driver.entities.users.AuthUserInfo
import xyz.driver.pdsuicommon.auth._
@@ -88,7 +89,7 @@ trait Directives {
val text = Json.stringify(implicitly[Writes[ErrorsResponse]].writes(err))
HttpEntity(ContentTypes.`application/json`, text)
}
- RejectionHandler.default.mapRejectionResponse {
+ DriverApp.rejectionHandler.mapRejectionResponse {
case res @ HttpResponse(_, _, ent: HttpEntity.Strict, _) =>
res.copy(entity = wrapContent(ent.data.utf8String))
case x => x // pass through all other types of responses