From bdbe5a10f288cb167a2cc187f43aa6707b45177b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Felix=20Kleinekath=C3=B6fer?= Date: Wed, 5 Dec 2018 17:31:02 +0100 Subject: [PATCH] Updated scala, sbt and more (#716) --- .travis.yml | 2 +- app/controllers/Organizations.scala | 4 +--- app/controllers/Users.scala | 6 +++--- app/controllers/project/Projects.scala | 2 +- app/views/projects/view.scala.html | 2 +- app/views/users/admin/userAdmin.scala.html | 6 +++--- app/views/users/view.scala.html | 2 +- build.sbt | 17 ++++++++--------- project/build.properties | 2 +- 9 files changed, 20 insertions(+), 23 deletions(-) diff --git a/.travis.yml b/.travis.yml index 0ed1c9413..af3e8ac82 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,7 +8,7 @@ jdk: - openjdk8 scala: - - 2.12.6 + - 2.12.8 services: postgresql diff --git a/app/controllers/Organizations.scala b/app/controllers/Organizations.scala index ae8508fc9..a4ffc3eae 100755 --- a/app/controllers/Organizations.scala +++ b/app/controllers/Organizations.scala @@ -121,9 +121,7 @@ class Organizations @Inject()(forms: OreForms)( * @return Json response with errors if any */ def updateAvatar(organization: String): Action[AnyContent] = EditOrganizationAction(organization) { - implicit request => - // TODO implement me - Ok + Ok } /** diff --git a/app/controllers/Users.scala b/app/controllers/Users.scala index 2b70ce825..dc6000b65 100755 --- a/app/controllers/Users.scala +++ b/app/controllers/Users.scala @@ -59,7 +59,7 @@ class Users @Inject()( * * @return Logged in page */ - def signUp(): Action[AnyContent] = Action.asyncF { implicit request => + def signUp(): Action[AnyContent] = Action.asyncF { val nonce = SingleSignOnConsumer.nonce this.signOns.add(SignOn(nonce = nonce)) *> redirectToSso(this.sso.getSignupUrl(this.baseUrl + "/login", nonce)) } @@ -114,7 +114,7 @@ class Users @Inject()( * @param returnPath Verified action to perform * @return Redirect to verification */ - def verify(returnPath: Option[String]): Action[AnyContent] = Authenticated.asyncF { implicit request => + def verify(returnPath: Option[String]): Action[AnyContent] = Authenticated.asyncF { val nonce = SingleSignOnConsumer.nonce this.signOns .add(SignOn(nonce = nonce)) *> redirectToSso( @@ -135,7 +135,7 @@ class Users @Inject()( * * @return Home page */ - def logOut(): Action[AnyContent] = Action { implicit request => + def logOut(): Action[AnyContent] = Action { Redirect(config.security.api.url + "/accounts/logout/") .clearingSession() .flashing("noRedirect" -> "true") diff --git a/app/controllers/project/Projects.scala b/app/controllers/project/Projects.scala index 8080b77b4..1f623b1b9 100644 --- a/app/controllers/project/Projects.scala +++ b/app/controllers/project/Projects.scala @@ -326,7 +326,7 @@ class Projects @Inject()(stats: StatTracker, forms: OreForms, factory: ProjectFa * @param slug Project slug * @return Project icon */ - def showIcon(author: String, slug: String): Action[AnyContent] = Action.asyncF { implicit request => + def showIcon(author: String, slug: String): Action[AnyContent] = Action.asyncF { // TODO maybe instead of redirect cache this on ore? projects .withSlug(author, slug) diff --git a/app/views/projects/view.scala.html b/app/views/projects/view.scala.html index ee14ac4b8..35f76b14f 100755 --- a/app/views/projects/view.scala.html +++ b/app/views/projects/view.scala.html @@ -131,7 +131,7 @@

@if(!noButtons) {
- @flash.get("reported").map { r => + @flash.get("reported").map { _ => Flag submitted for review diff --git a/app/views/users/admin/userAdmin.scala.html b/app/views/users/admin/userAdmin.scala.html index 0e115de63..38599bd7a 100644 --- a/app/views/users/admin/userAdmin.scala.html +++ b/app/views/users/admin/userAdmin.scala.html @@ -68,7 +68,7 @@

@prefix@user.user
@if(!user.isOrga) { @panel("Organizations") { - @roleTable[Organization, OrganizationUserRole]("Organization", "orgRole", withOwner = true, user.orgas.map(t => (t._1, t._3, t._4.name)).toSet, orgRoles) { (org, role) => + @roleTable[Organization, OrganizationUserRole]("Organization", "orgRole", withOwner = true, user.orgas.map(t => (t._1, t._3, t._4.name)).toSet, orgRoles) { (org, _) => @org.name @@ -76,7 +76,7 @@

@prefix@user.user } } else { @panel("Members") { - @roleTable[User, OrganizationUserRole]("User", "memberRole", withOwner = false, orga.get.members.map(t => (t._2, t._1, null)).toSet, orgRoles) { (user, role) => + @roleTable[User, OrganizationUserRole]("User", "memberRole", withOwner = false, orga.get.members.map(t => (t._2, t._1, null)).toSet, orgRoles) { (user, _) => @user.name @@ -87,7 +87,7 @@

@prefix@user.user @if(!user.isOrga) {
@panel("Projects") { - @roleTable[Project, ProjectUserRole]("Project", "projectRole", withOwner = true, userProjectRoles.map(t => (t._1, t._2, t._1.ownerName)).toSet, projectRoles) { (project, role) => + @roleTable[Project, ProjectUserRole]("Project", "projectRole", withOwner = true, userProjectRoles.map(t => (t._1, t._2, t._1.ownerName)).toSet, projectRoles) { (project, _) => @project.name diff --git a/app/views/users/view.scala.html b/app/views/users/view.scala.html index d27652287..66974971b 100644 --- a/app/views/users/view.scala.html +++ b/app/views/users/view.scala.html @@ -25,7 +25,7 @@ @alert("error") - @flash.get("pgp-updated").map { updated => + @flash.get("pgp-updated").map { _ =>