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

Rename ProjectService to RepositoryService.

Browse Source
This commit is contained in:
takezoe
2013-06-04 01:14:27 +09:00
parent f9c085ced6
commit 78ad794613
7 changed files with 21 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -9,12 +9,12 @@ import org.apache.commons.io._
import jp.sf.amateras.scalatra.forms._
class CreateRepositoryController extends CreateRepositoryControllerBase
with ProjectService with AccountService with WikiService
with RepositoryService with AccountService with WikiService
/**
* Creates new repository.
*/
trait CreateRepositoryControllerBase extends ControllerBase { self: ProjectService with WikiService =>
trait CreateRepositoryControllerBase extends ControllerBase { self: RepositoryService with WikiService =>
case class RepositoryCreationForm(name: String, description: String) // TODO Option
@@ -37,7 +37,7 @@ trait CreateRepositoryControllerBase extends ControllerBase { self: ProjectServi
val loginUserName = context.loginAccount.get.userName
// Insert to the database at first
createProject(form.name, loginUserName, Some(form.description))
createRepository(form.name, loginUserName, Some(form.description))
// Create the actual repository
val gitdir = getRepositoryDir(loginUserName, form.name)

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

@@ -2,9 +2,9 @@ package app
import service._
class IndexController extends IndexControllerBase with ProjectService with AccountService
class IndexController extends IndexControllerBase with RepositoryService with AccountService
trait IndexControllerBase extends ControllerBase { self: ProjectService =>
trait IndexControllerBase extends ControllerBase { self: RepositoryService =>
get("/"){
html.index(getAccessibleRepositories(context.loginAccount, servletContext))

6
src/main/scala/app/RepositoryViewerController.scala
View File

@@ -11,12 +11,14 @@ import org.eclipse.jgit.lib._
import org.apache.commons.io.FileUtils
import org.eclipse.jgit.treewalk._
class RepositoryViewerController extends RepositoryViewerControllerBase with ProjectService with AccountService
class RepositoryViewerController extends RepositoryViewerControllerBase
with RepositoryService with AccountService
/**
* The repository viewer.
*/
trait RepositoryViewerControllerBase extends ControllerBase { self: ProjectService with AccountService =>
trait RepositoryViewerControllerBase extends ControllerBase {
self: RepositoryService with AccountService =>
// TODO separate to AccountController?
/**

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

@@ -2,10 +2,10 @@ package app
import service._
class SettingsController extends SettingsControllerBase with ProjectService with AccountService
class SettingsController extends SettingsControllerBase with RepositoryService with AccountService
trait SettingsControllerBase extends ControllerBase { self: ProjectService =>
trait SettingsControllerBase extends ControllerBase { self: RepositoryService =>
get("/:owner/:repository/settings") {
val owner = params("owner")

5
src/main/scala/app/WikiController.scala
View File

@@ -5,9 +5,10 @@ import util.JGitUtil
import util.Directory._
import jp.sf.amateras.scalatra.forms._
class WikiController extends WikiControllerBase with WikiService with ProjectService with AccountService
class WikiController extends WikiControllerBase
with WikiService with RepositoryService with AccountService
trait WikiControllerBase extends ControllerBase { self: WikiService with ProjectService =>
trait WikiControllerBase extends ControllerBase { self: WikiService with RepositoryService =>
case class WikiPageEditForm(pageName: String, content: String, message: Option[String], currentPageName: String)