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

Add SystemSettings to Context properties

Browse Source
This commit is contained in:
takezoe
2014-03-15 01:24:34 +09:00
parent 4870533710
commit 02a367fd99
24 changed files with 53 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/scala/app/AccountController.scala
View File

@@ -132,7 +132,7 @@ trait AccountControllerBase extends AccountManagementControllerBase {
get("/:userName/_edit")(oneselfOnly {
val userName = params("userName")
getAccountByUserName(userName).map { x =>
account.html.edit(x, loadSystemSettings(), flash.get("info"))
account.html.edit(x, flash.get("info"))
} getOrElse NotFound
})
@@ -176,7 +176,7 @@ trait AccountControllerBase extends AccountManagementControllerBase {
get("/:userName/_ssh")(oneselfOnly {
val userName = params("userName")
getAccountByUserName(userName).map { x =>
account.html.ssh(x, loadSystemSettings(), getPublicKeys(x.userName))
account.html.ssh(x, getPublicKeys(x.userName))
} getOrElse NotFound
})
@@ -194,7 +194,7 @@ trait AccountControllerBase extends AccountManagementControllerBase {
})
get("/register"){
if(loadSystemSettings().allowAccountRegistration){
if(context.settings.allowAccountRegistration){
if(context.loginAccount.isDefined){
redirect("/")
} else {
@@ -204,7 +204,7 @@ trait AccountControllerBase extends AccountManagementControllerBase {
}
post("/register", newForm){ form =>
if(loadSystemSettings().allowAccountRegistration){
if(context.settings.allowAccountRegistration){
createAccount(form.userName, sha1(form.password), form.fullName, form.mailAddress, false, form.url)
updateImage(form.userName, form.fileId, false)
redirect("/signin")