Nemcio/GitBucket
1
0
Fork 0
mirror of https://github.com/gitbucket/gitbucket.git synced 2025-11-06 21:45:50 +01:00
Code Issues Packages Projects Releases Wiki Activity

Small fix

Browse Source
This commit is contained in:
takezoe
2014-03-15 16:06:49 +09:00
parent f5883abf04
commit d86f40e3a2
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/scala/app/IndexController.scala
View File

@@ -35,7 +35,7 @@ trait IndexControllerBase extends ControllerBase {
} }
post("/signin", form){ form => post("/signin", form){ form =>
authenticate(loadSystemSettings(), form.userName, form.password) match { authenticate(context.settings, form.userName, form.password) match {
case Some(account) => signin(account) case Some(account) => signin(account)
case None => redirect("/signin") case None => redirect("/signin")
} }

4
src/main/scala/app/SystemSettingsController.scala
View File

@@ -7,10 +7,10 @@ import jp.sf.amateras.scalatra.forms._
import ssh.SshServer import ssh.SshServer
class SystemSettingsController extends SystemSettingsControllerBase class SystemSettingsController extends SystemSettingsControllerBase
with SystemSettingsService with AccountService with AdminAuthenticator with AccountService with AdminAuthenticator
trait SystemSettingsControllerBase extends ControllerBase { trait SystemSettingsControllerBase extends ControllerBase {
self: SystemSettingsService with AccountService with AdminAuthenticator => self: AccountService with AdminAuthenticator =>
private val form = mapping( private val form = mapping(
"baseUrl" -> trim(label("Base URL", optional(text()))), "baseUrl" -> trim(label("Base URL", optional(text()))),