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

Move group.scala.html to account package

Browse Source
This commit is contained in:
takezoe
2014-03-06 11:26:58 +09:00
parent 50d84835cb
commit c0f5cb1641
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -182,7 +182,7 @@ trait AccountControllerBase extends AccountManagementControllerBase {
} }
get("/groups/new")(usersOnly { get("/groups/new")(usersOnly {
html.group(None, List((context.loginAccount.get.userName, true))) account.html.group(None, List((context.loginAccount.get.userName, true)))
}) })
post("/groups/new", newGroupForm)(usersOnly { form => post("/groups/new", newGroupForm)(usersOnly { form =>
@@ -198,7 +198,7 @@ trait AccountControllerBase extends AccountManagementControllerBase {
get("/:groupName/_editgroup")(managersOnly { get("/:groupName/_editgroup")(managersOnly {
defining(params("groupName")){ groupName => defining(params("groupName")){ groupName =>
html.group(getAccountByUserName(groupName, true), getGroupMembers(groupName)) account.html.group(getAccountByUserName(groupName, true), getGroupMembers(groupName))
} }
}) })

2
src/main/twirl/group.scala.html → src/main/twirl/account/group.scala.html
View File

@@ -1,7 +1,7 @@
@(account: Option[model.Account], members: List[(String, Boolean)])(implicit context: app.Context) @(account: Option[model.Account], members: List[(String, Boolean)])(implicit context: app.Context)
@import context._ @import context._
@import view.helpers._ @import view.helpers._
@main(if(account.isEmpty) "Create group" else "Edit group"){ @html.main(if(account.isEmpty) "Create group" else "Edit group"){
<div> <div>
<form id="form" method="post" action="@if(account.isEmpty){@path/groups/new} else {@path/@account.get.userName/_editgroup}" validate="true"> <form id="form" method="post" action="@if(account.isEmpty){@path/groups/new} else {@path/@account.get.userName/_editgroup}" validate="true">
<div class="row-fluid"> <div class="row-fluid">