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

Move isWritable to RepositoryService.

Browse Source
This commit is contained in:
takezoe
2013-06-23 02:48:02 +09:00
parent 157f545186
commit 6702fdf24f
2 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -33,7 +33,7 @@ trait WikiControllerBase extends ControllerBase {
getRepository(owner, repository, baseUrl) match {
case Some(repoInfo) => getWikiPage(owner, repository, "Home") match {
case Some(page) => wiki.html.wiki("Home", page, repoInfo, isWritable(owner, repository))
case Some(page) => wiki.html.wiki("Home", page, repoInfo, isWritable(owner, repository, context.loginAccount))
case None => redirect("/%s/%s/wiki/Home/_edit".format(owner, repository))
}
case None => NotFound()
@@ -46,7 +46,7 @@ trait WikiControllerBase extends ControllerBase {
val pageName = params("page")
getWikiPage(owner, repository, pageName) match {
case Some(page) => wiki.html.wiki(pageName, page, getRepository(owner, repository, baseUrl).get, isWritable(owner, repository))
case Some(page) => wiki.html.wiki(pageName, page, getRepository(owner, repository, baseUrl).get, isWritable(owner, repository, context.loginAccount))
case None => redirect("/%s/%s/wiki/%s/_edit".format(owner, repository, pageName)) // TODO URLEncode
}
})
@@ -145,7 +145,7 @@ trait WikiControllerBase extends ControllerBase {
val repository = params("repository")
getRepository(owner, repository, baseUrl) match {
case Some(repoInfo) => wiki.html.wikipages(getWikiPageList(owner, repository), repoInfo, isWritable(owner, repository))
case Some(repoInfo) => wiki.html.wikipages(getWikiPageList(owner, repository), repoInfo, isWritable(owner, repository, context.loginAccount))
case None => NotFound()
}
})
@@ -176,15 +176,6 @@ trait WikiControllerBase extends ControllerBase {
}
})
private def isWritable(owner: String, repository: String): Boolean = {
context.loginAccount match {
case Some(a) if(a.isAdmin) => true
case Some(a) if(a.userName == owner) => true
case Some(a) if(getCollaborators(owner, repository).contains(a.userName)) => true
case _ => false
}
}
private def unique: Constraint = new Constraint(){
def validate(name: String, value: String): Option[String] =
getWikiPageList(params("owner"), params("repository")).find(_ == value).map(_ => "Page already exists.")

9
src/main/scala/service/RepositoryService.scala
View File

@@ -209,6 +209,15 @@ trait RepositoryService { self: AccountService =>
(c.userName is userName.bind) && (c.repositoryName is repositoryName.bind)
} sortBy(_.collaboratorName) list) map(_.collaboratorName)
def isWritable(owner: String, repository: String, loginAccount: Option[Account]): Boolean = {
loginAccount match {
case Some(a) if(a.isAdmin) => true
case Some(a) if(a.userName == owner) => true
case Some(a) if(getCollaborators(owner, repository).contains(a.userName)) => true
case _ => false
}
}
}
object RepositoryService {