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

(refs #4)Add 'Public Activity' tab to the account information page.

Browse Source
This commit is contained in:
takezoe
2013-07-06 20:03:34 +09:00
parent eba81a6065
commit f84078c7ca
10 changed files with 143 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -6,10 +6,12 @@ import util.StringUtil._
import jp.sf.amateras.scalatra.forms._
class AccountController extends AccountControllerBase
with SystemSettingsService with AccountService with RepositoryService with OneselfAuthenticator
with SystemSettingsService with AccountService with RepositoryService with ActivityService
with OneselfAuthenticator
trait AccountControllerBase extends ControllerBase {
self: SystemSettingsService with AccountService with RepositoryService with OneselfAuthenticator =>
self: SystemSettingsService with AccountService with RepositoryService with ActivityService
with OneselfAuthenticator =>
case class AccountNewForm(userName: String, password: String,mailAddress: String, url: Option[String])
@@ -33,8 +35,13 @@ trait AccountControllerBase extends ControllerBase {
*/
get("/:userName") {
val userName = params("userName")
getAccountByUserName(userName).map {
account.html.info(_, getVisibleRepositories(userName, baseUrl, context.loginAccount.map(_.userName)))
getAccountByUserName(userName).map { x =>
params.getOrElse("tab", "repositories") match {
// Public Activity
case "activity" => account.html.activity(x, getActivitiesByUser(userName, true))
// Repositories
case _ => account.html.repositories(x, getVisibleRepositories(userName, baseUrl, context.loginAccount.map(_.userName)))
}
} getOrElse NotFound
}

14
src/main/scala/app/CreateRepositoryController.scala
View File

@@ -10,13 +10,15 @@ import org.apache.commons.io._
import jp.sf.amateras.scalatra.forms._
class CreateRepositoryController extends CreateRepositoryControllerBase
with RepositoryService with AccountService with WikiService with LabelsService with UsersAuthenticator
with RepositoryService with AccountService with WikiService with LabelsService with ActivityService
with UsersAuthenticator
/**
* Creates new repository.
*/
trait CreateRepositoryControllerBase extends ControllerBase {
self: RepositoryService with WikiService with LabelsService with UsersAuthenticator =>
self: RepositoryService with WikiService with LabelsService with ActivityService
with UsersAuthenticator =>
case class RepositoryCreationForm(name: String, description: Option[String])
@@ -36,7 +38,8 @@ trait CreateRepositoryControllerBase extends ControllerBase {
* Create new repository.
*/
post("/new", form)(usersOnly { form =>
val loginUserName = context.loginAccount.get.userName
val loginAccount = context.loginAccount.get
val loginUserName = loginAccount.userName
// Insert to the database at first
createRepository(form.name, loginUserName, form.description)
@@ -82,7 +85,10 @@ trait CreateRepositoryControllerBase extends ControllerBase {
}
// Create Wiki repository
createWikiRepository(context.loginAccount.get, form.name)
createWikiRepository(loginAccount, form.name)
// Record activity
recordCreateRepository(loginUserName, form.name, loginUserName)
// redirect to the repository
redirect("/%s/%s".format(loginUserName, form.name))