Add FlashMapSupport to ControllerBase.

src/main/scala/app/AccountController.scala

@@ -5,13 +5,12 @@ import util.{FileUtil, OneselfAuthenticator}
 import util.StringUtil._
 import util.Directory._
 import jp.sf.amateras.scalatra.forms._
-import org.scalatra.FlashMapSupport
 import org.apache.commons.io.FileUtils
 
 class AccountController extends AccountControllerBase
   with AccountService with RepositoryService with ActivityService with OneselfAuthenticator
 
-trait AccountControllerBase extends AccountManagementControllerBase with FlashMapSupport {
+trait AccountControllerBase extends AccountManagementControllerBase {
   self: AccountService with RepositoryService with ActivityService with OneselfAuthenticator =>
 
   case class AccountNewForm(userName: String, password: String, fullName: String, mailAddress: String,

src/main/scala/app/ControllerBase.scala

@@ -20,7 +20,8 @@ import org.scalatra.i18n._
  * Provides generic features for controller implementations.
  */
 abstract class ControllerBase extends ScalatraFilter
-  with ClientSideValidationFormSupport with JacksonJsonSupport with I18nSupport with Validations with SystemSettingsService {
+  with ClientSideValidationFormSupport with JacksonJsonSupport with I18nSupport with FlashMapSupport with Validations
+  with SystemSettingsService {
 
   implicit val jsonFormats = DefaultFormats
 

src/main/scala/app/FileUploadController.scala

@@ -12,8 +12,7 @@ import org.apache.commons.io.FileUtils
  * This servlet saves uploaded file as temporary file and returns the unique id.
  * You can get uploaded file using [[app.FileUploadControllerBase#getTemporaryFile()]] with this id.
  */
-class FileUploadController extends ScalatraServlet
+class FileUploadController extends ScalatraServlet with FileUploadSupport with FileUploadControllerBase {
-  with FileUploadSupport with FlashMapSupport with FileUploadControllerBase {
 
   configureMultipartHandling(MultipartConfig(maxFileSize = Some(3 * 1024 * 1024)))
 

src/main/scala/app/IndexController.scala

@@ -31,6 +31,7 @@ trait IndexControllerBase extends ControllerBase {
   get("/signin"){
     val redirect = params.get("redirect")
     if(redirect.isDefined && redirect.get.startsWith("/")){
+
       session.setAttribute(Keys.Session.Redirect, redirect.get)
     }
     html.signin(loadSystemSettings())

src/main/scala/app/RepositorySettingsController.scala

@@ -5,7 +5,6 @@ import util.Directory._
 import util.{UsersAuthenticator, OwnerAuthenticator}
 import jp.sf.amateras.scalatra.forms._
 import org.apache.commons.io.FileUtils
-import org.scalatra.FlashMapSupport
 import org.scalatra.i18n.Messages
 import service.WebHookService.WebHookPayload
 import util.JGitUtil.CommitInfo
@@ -16,7 +15,7 @@ class RepositorySettingsController extends RepositorySettingsControllerBase
   with RepositoryService with AccountService with WebHookService
   with OwnerAuthenticator with UsersAuthenticator
 
-trait RepositorySettingsControllerBase extends ControllerBase with FlashMapSupport {
+trait RepositorySettingsControllerBase extends ControllerBase {
   self: RepositoryService with AccountService with WebHookService
     with OwnerAuthenticator with UsersAuthenticator =>
 

src/main/scala/app/SystemSettingsController.scala

@@ -4,12 +4,11 @@ import service.{AccountService, SystemSettingsService}
 import SystemSettingsService._
 import util.AdminAuthenticator
 import jp.sf.amateras.scalatra.forms._
-import org.scalatra.FlashMapSupport
 
 class SystemSettingsController extends SystemSettingsControllerBase
   with SystemSettingsService with AccountService with AdminAuthenticator
 
-trait SystemSettingsControllerBase extends ControllerBase with FlashMapSupport {
+trait SystemSettingsControllerBase extends ControllerBase {
   self: SystemSettingsService with AccountService with AdminAuthenticator =>
 
   private val form = mapping(

src/main/scala/app/WikiController.scala

@@ -6,18 +6,15 @@ import util.Directory._
 import util.ControlUtil._
 import jp.sf.amateras.scalatra.forms._
 import org.eclipse.jgit.api.Git
-import org.scalatra.FlashMapSupport
 import org.scalatra.i18n.Messages
 import scala.Some
 import java.util.ResourceBundle
 
 class WikiController extends WikiControllerBase 
-  with WikiService with RepositoryService with AccountService with ActivityService
+  with WikiService with RepositoryService with AccountService with ActivityService with CollaboratorsAuthenticator with ReferrerAuthenticator
-  with CollaboratorsAuthenticator with ReferrerAuthenticator
 
-trait WikiControllerBase extends ControllerBase with FlashMapSupport {
+trait WikiControllerBase extends ControllerBase {
-  self: WikiService with RepositoryService with ActivityService
+  self: WikiService with RepositoryService with ActivityService with CollaboratorsAuthenticator with ReferrerAuthenticator =>
-    with CollaboratorsAuthenticator with ReferrerAuthenticator =>
 
   case class WikiPageEditForm(pageName: String, content: String, message: Option[String], currentPageName: String, id: String)