From dc78dc9b0dbc27418c42d2347681c22430c3ebfe Mon Sep 17 00:00:00 2001 From: odz Date: Sat, 30 Nov 2013 18:57:19 +0900 Subject: [PATCH 01/47] Close issues via commit messages --- src/main/scala/app/PullRequestsController.scala | 13 +++++++++++++ src/main/scala/service/IssuesService.scala | 12 ++++++++++++ src/main/scala/servlet/GitRepositoryServlet.scala | 8 ++++++++ 3 files changed, 33 insertions(+) diff --git a/src/main/scala/app/PullRequestsController.scala b/src/main/scala/app/PullRequestsController.scala index 365fb9270..e91ff786e 100644 --- a/src/main/scala/app/PullRequestsController.scala +++ b/src/main/scala/app/PullRequestsController.scala @@ -163,6 +163,19 @@ trait PullRequestsControllerBase extends ControllerBase { } } + // close issue by content of pull request + val defaultBranch = getRepository(owner, name, baseUrl).get.repository.defaultBranch + if(pullreq.branch == defaultBranch){ + commits.flatten.foreach { commit => + closeIssuesFromMessage(commit.fullMessage, loginAccount.userName, owner, name) + } + issue.content match { + case Some(content) => closeIssuesFromMessage(content, loginAccount.userName, owner, name) + case _ => + } + closeIssuesFromMessage(form.message, loginAccount.userName, owner, name) + } + // notifications Notifier().toNotify(repository, issueId, "merge"){ Notifier.msgStatus(s"${baseUrl}/${owner}/${name}/pull/${issueId}") diff --git a/src/main/scala/service/IssuesService.scala b/src/main/scala/service/IssuesService.scala index 493692e4d..ec6f93619 100644 --- a/src/main/scala/service/IssuesService.scala +++ b/src/main/scala/service/IssuesService.scala @@ -314,6 +314,18 @@ trait IssuesService { }.toList } + def closeIssuesFromMessage(message: String, userName: String, owner: String, repository: String) = { + val regex = "(?i)(? + getIssue(owner, repository, issueId) match { + case Some(issue) if !issue.closed => { + createComment(owner, repository, userName, issue.issueId, "Close", "close") + updateClosed(owner, repository, issue.issueId, true) + } + case _ => + } + } + } } object IssuesService { diff --git a/src/main/scala/servlet/GitRepositoryServlet.scala b/src/main/scala/servlet/GitRepositoryServlet.scala index a00a92811..4c02070de 100644 --- a/src/main/scala/servlet/GitRepositoryServlet.scala +++ b/src/main/scala/servlet/GitRepositoryServlet.scala @@ -140,6 +140,14 @@ class CommitLogHook(owner: String, repository: String, userName: String, baseURL } } + // close issues + val defaultBranch = getRepository(owner, repository, baseURL).get.repository.defaultBranch + if(refName(1) == "heads" && branchName == defaultBranch && command.getType == ReceiveCommand.Type.UPDATE){ + git.log.addRange(command.getOldId, command.getNewId).call.asScala.foreach { commit => + closeIssuesFromMessage(commit.getFullMessage, userName, owner, repository) + } + } + // call web hook val webHookURLs = getWebHookURLs(owner, repository) if(webHookURLs.nonEmpty){ From 2c14dfb781dae1e3fd8610aad047a4b9fdf14495 Mon Sep 17 00:00:00 2001 From: Tobias Roeser Date: Wed, 26 Feb 2014 12:09:14 +0100 Subject: [PATCH 02/47] Show the correct name of the readme file (instead of showing always README.md). --- src/main/scala/app/RepositoryViewerController.scala | 2 +- src/main/twirl/repo/files.scala.html | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/scala/app/RepositoryViewerController.scala b/src/main/scala/app/RepositoryViewerController.scala index 272613682..fcc81dfe6 100644 --- a/src/main/scala/app/RepositoryViewerController.scala +++ b/src/main/scala/app/RepositoryViewerController.scala @@ -276,7 +276,7 @@ trait RepositoryViewerControllerBase extends ControllerBase { val readme = files.find { file => readmeFiles.contains(file.name.toLowerCase) }.map { file => - StringUtil.convertFromByteArray(JGitUtil.getContent(Git.open(getRepositoryDir(repository.owner, repository.name)), file.id, true).get) + file -> StringUtil.convertFromByteArray(JGitUtil.getContent(Git.open(getRepositoryDir(repository.owner, repository.name)), file.id, true).get) } repo.html.files(revision, repository, diff --git a/src/main/twirl/repo/files.scala.html b/src/main/twirl/repo/files.scala.html index 94f6dac3d..823298ec7 100644 --- a/src/main/twirl/repo/files.scala.html +++ b/src/main/twirl/repo/files.scala.html @@ -3,7 +3,7 @@ pathList: List[String], latestCommit: util.JGitUtil.CommitInfo, files: List[util.JGitUtil.FileInfo], - readme: Option[String])(implicit context: app.Context) + readme: Option[(util.JGitUtil.FileInfo, String)])(implicit context: app.Context) @import context._ @import view.helpers._ @html.main(s"${repository.owner}/${repository.name}", Some(repository)) { @@ -77,9 +77,9 @@ - @readme.map { content => + @readme.map { case(file, content) =>
-
README.md
+
@file.name
@markdown(content, repository, false, false)
} From 7a0a62af2d94dde1e2ce548c3ed3d17656b87501 Mon Sep 17 00:00:00 2001 From: Tobias Roeser Date: Fri, 28 Feb 2014 15:25:32 +0100 Subject: [PATCH 03/47] Show repository description below the name on repository page. --- src/main/twirl/header.scala.html | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/main/twirl/header.scala.html b/src/main/twirl/header.scala.html index bb2be97e3..965fa9381 100644 --- a/src/main/twirl/header.scala.html +++ b/src/main/twirl/header.scala.html @@ -29,7 +29,13 @@ } } + + + @if(repository.repository.description != "") { +

@repository.repository.description

+ } +
From f13d757976b1ba5f79fd8d863cbdb41d5f1d200b Mon Sep 17 00:00:00 2001 From: Tobias Roeser Date: Fri, 28 Feb 2014 16:28:40 +0100 Subject: [PATCH 04/47] Compare email adresses case-insensitive. --- src/main/scala/service/AccountService.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/scala/service/AccountService.scala b/src/main/scala/service/AccountService.scala index 84e78a1a4..ff1186f65 100644 --- a/src/main/scala/service/AccountService.scala +++ b/src/main/scala/service/AccountService.scala @@ -59,7 +59,7 @@ trait AccountService { Query(Accounts) filter(t => (t.userName is userName.bind) && (t.removed is false.bind, !includeRemoved)) firstOption def getAccountByMailAddress(mailAddress: String, includeRemoved: Boolean = false): Option[Account] = - Query(Accounts) filter(t => (t.mailAddress is mailAddress.bind) && (t.removed is false.bind, !includeRemoved)) firstOption + Query(Accounts) filter(t => (t.mailAddress.toLowerCase is mailAddress.toLowerCase.bind) && (t.removed is false.bind, !includeRemoved)) firstOption def getAllUsers(includeRemoved: Boolean = true): List[Account] = if(includeRemoved){ From 98266fe0e1a7f57af2f1305d32b68cecbb138c31 Mon Sep 17 00:00:00 2001 From: takezoe Date: Sat, 1 Mar 2014 13:05:42 +0900 Subject: [PATCH 05/47] (refs #279)Fix webhook URL to use the configured base URL. --- src/main/scala/app/ControllerBase.scala | 6 ------ src/main/scala/service/SystemSettingsService.scala | 7 +++++++ src/main/scala/servlet/GitRepositoryServlet.scala | 14 ++++++-------- 3 files changed, 13 insertions(+), 14 deletions(-) diff --git a/src/main/scala/app/ControllerBase.scala b/src/main/scala/app/ControllerBase.scala index bdea0421e..0bf4676c4 100644 --- a/src/main/scala/app/ControllerBase.scala +++ b/src/main/scala/app/ControllerBase.scala @@ -111,12 +111,6 @@ abstract class ControllerBase extends ScalatraFilter } } - protected def baseUrl = loadSystemSettings().baseUrl.getOrElse { - defining(request.getRequestURL.toString){ url => - url.substring(0, url.length - (request.getRequestURI.length - request.getContextPath.length)) - } - }.replaceFirst("/$", "") - } /** diff --git a/src/main/scala/service/SystemSettingsService.scala b/src/main/scala/service/SystemSettingsService.scala index de7a9662f..f15bd3782 100644 --- a/src/main/scala/service/SystemSettingsService.scala +++ b/src/main/scala/service/SystemSettingsService.scala @@ -3,9 +3,16 @@ package service import util.Directory._ import util.ControlUtil._ import SystemSettingsService._ +import javax.servlet.http.HttpServletRequest trait SystemSettingsService { + def baseUrl(implicit request: HttpServletRequest): String = loadSystemSettings().baseUrl.getOrElse { + defining(request.getRequestURL.toString){ url => + url.substring(0, url.length - (request.getRequestURI.length - request.getContextPath.length)) + } + }.replaceFirst("/$", "") + def saveSystemSettings(settings: SystemSettings): Unit = { defining(new java.util.Properties()){ props => settings.baseUrl.foreach(props.setProperty(BaseURL, _)) diff --git a/src/main/scala/servlet/GitRepositoryServlet.scala b/src/main/scala/servlet/GitRepositoryServlet.scala index 7eedd2137..2c521c804 100644 --- a/src/main/scala/servlet/GitRepositoryServlet.scala +++ b/src/main/scala/servlet/GitRepositoryServlet.scala @@ -50,10 +50,10 @@ class GitRepositoryServlet extends GitServlet { } -class GitBucketReceivePackFactory extends ReceivePackFactory[HttpServletRequest] { +class GitBucketReceivePackFactory extends ReceivePackFactory[HttpServletRequest] with SystemSettingsService { private val logger = LoggerFactory.getLogger(classOf[GitBucketReceivePackFactory]) - + override def create(request: HttpServletRequest, db: Repository): ReceivePack = { val receivePack = new ReceivePack(db) val pusher = request.getAttribute(Keys.Request.UserName).asInstanceOf[String] @@ -64,13 +64,11 @@ class GitBucketReceivePackFactory extends ReceivePackFactory[HttpServletRequest] defining(request.paths){ paths => val owner = paths(1) val repository = paths(2).replaceFirst("\\.git$", "") - val baseURL = request.getRequestURL.toString.replaceFirst("/git/.*", "") logger.debug("repository:" + owner + "/" + repository) - logger.debug("baseURL:" + baseURL) if(!repository.endsWith(".wiki")){ - receivePack.setPostReceiveHook(new CommitLogHook(owner, repository, pusher, baseURL)) + receivePack.setPostReceiveHook(new CommitLogHook(owner, repository, pusher, baseUrl(request))) } receivePack } @@ -79,7 +77,7 @@ class GitBucketReceivePackFactory extends ReceivePackFactory[HttpServletRequest] import scala.collection.JavaConverters._ -class CommitLogHook(owner: String, repository: String, pusher: String, baseURL: String) extends PostReceiveHook +class CommitLogHook(owner: String, repository: String, pusher: String, baseUrl: String) extends PostReceiveHook with RepositoryService with AccountService with IssuesService with ActivityService with PullRequestService with WebHookService { private val logger = LoggerFactory.getLogger(classOf[CommitLogHook]) @@ -148,7 +146,7 @@ class CommitLogHook(owner: String, repository: String, pusher: String, baseURL: case webHookURLs if(webHookURLs.nonEmpty) => for(pusherAccount <- getAccountByUserName(pusher); ownerAccount <- getAccountByUserName(owner); - repositoryInfo <- getRepository(owner, repository, baseURL)){ + repositoryInfo <- getRepository(owner, repository, baseUrl)){ callWebHook(owner, repository, webHookURLs, WebHookPayload(git, pusherAccount, command.getRefName, repositoryInfo, newCommits, ownerAccount)) } @@ -181,7 +179,7 @@ class CommitLogHook(owner: String, repository: String, pusher: String, baseURL: */ private def updatePullRequests(branch: String) = getPullRequestsByRequest(owner, repository, branch, false).foreach { pullreq => - if(getRepository(pullreq.userName, pullreq.repositoryName, baseURL).isDefined){ + if(getRepository(pullreq.userName, pullreq.repositoryName, baseUrl).isDefined){ using(Git.open(Directory.getRepositoryDir(pullreq.userName, pullreq.repositoryName))){ git => git.fetch .setRemote(Directory.getRepositoryDir(owner, repository).toURI.toString) From 590b431ec1e0396f19fd7ac52e1a26c6cb990298 Mon Sep 17 00:00:00 2001 From: takezoe Date: Sat, 1 Mar 2014 13:27:36 +0900 Subject: [PATCH 06/47] Add FlashMapSupport to ControllerBase. --- src/main/scala/app/AccountController.scala | 3 +-- src/main/scala/app/ControllerBase.scala | 3 ++- src/main/scala/app/FileUploadController.scala | 3 +-- src/main/scala/app/IndexController.scala | 1 + src/main/scala/app/RepositorySettingsController.scala | 3 +-- src/main/scala/app/SystemSettingsController.scala | 3 +-- src/main/scala/app/WikiController.scala | 9 +++------ 7 files changed, 10 insertions(+), 15 deletions(-) diff --git a/src/main/scala/app/AccountController.scala b/src/main/scala/app/AccountController.scala index 5bea0b4bc..df24aad3f 100644 --- a/src/main/scala/app/AccountController.scala +++ b/src/main/scala/app/AccountController.scala @@ -5,13 +5,12 @@ import util.{FileUtil, OneselfAuthenticator} import util.StringUtil._ import util.Directory._ import jp.sf.amateras.scalatra.forms._ -import org.scalatra.FlashMapSupport import org.apache.commons.io.FileUtils class AccountController extends AccountControllerBase with AccountService with RepositoryService with ActivityService with OneselfAuthenticator -trait AccountControllerBase extends AccountManagementControllerBase with FlashMapSupport { +trait AccountControllerBase extends AccountManagementControllerBase { self: AccountService with RepositoryService with ActivityService with OneselfAuthenticator => case class AccountNewForm(userName: String, password: String, fullName: String, mailAddress: String, diff --git a/src/main/scala/app/ControllerBase.scala b/src/main/scala/app/ControllerBase.scala index 0bf4676c4..d1e39e8bd 100644 --- a/src/main/scala/app/ControllerBase.scala +++ b/src/main/scala/app/ControllerBase.scala @@ -20,7 +20,8 @@ import org.scalatra.i18n._ * Provides generic features for controller implementations. */ abstract class ControllerBase extends ScalatraFilter - with ClientSideValidationFormSupport with JacksonJsonSupport with I18nSupport with Validations with SystemSettingsService { + with ClientSideValidationFormSupport with JacksonJsonSupport with I18nSupport with FlashMapSupport with Validations + with SystemSettingsService { implicit val jsonFormats = DefaultFormats diff --git a/src/main/scala/app/FileUploadController.scala b/src/main/scala/app/FileUploadController.scala index 6ea5fa23c..9950b4850 100644 --- a/src/main/scala/app/FileUploadController.scala +++ b/src/main/scala/app/FileUploadController.scala @@ -12,8 +12,7 @@ import org.apache.commons.io.FileUtils * This servlet saves uploaded file as temporary file and returns the unique id. * You can get uploaded file using [[app.FileUploadControllerBase#getTemporaryFile()]] with this id. */ -class FileUploadController extends ScalatraServlet - with FileUploadSupport with FlashMapSupport with FileUploadControllerBase { +class FileUploadController extends ScalatraServlet with FileUploadSupport with FileUploadControllerBase { configureMultipartHandling(MultipartConfig(maxFileSize = Some(3 * 1024 * 1024))) diff --git a/src/main/scala/app/IndexController.scala b/src/main/scala/app/IndexController.scala index 2ee96bdf9..92ee29159 100644 --- a/src/main/scala/app/IndexController.scala +++ b/src/main/scala/app/IndexController.scala @@ -31,6 +31,7 @@ trait IndexControllerBase extends ControllerBase { get("/signin"){ val redirect = params.get("redirect") if(redirect.isDefined && redirect.get.startsWith("/")){ + session.setAttribute(Keys.Session.Redirect, redirect.get) } html.signin(loadSystemSettings()) diff --git a/src/main/scala/app/RepositorySettingsController.scala b/src/main/scala/app/RepositorySettingsController.scala index d745623eb..3f5489a96 100644 --- a/src/main/scala/app/RepositorySettingsController.scala +++ b/src/main/scala/app/RepositorySettingsController.scala @@ -5,7 +5,6 @@ import util.Directory._ import util.{UsersAuthenticator, OwnerAuthenticator} import jp.sf.amateras.scalatra.forms._ import org.apache.commons.io.FileUtils -import org.scalatra.FlashMapSupport import org.scalatra.i18n.Messages import service.WebHookService.WebHookPayload import util.JGitUtil.CommitInfo @@ -16,7 +15,7 @@ class RepositorySettingsController extends RepositorySettingsControllerBase with RepositoryService with AccountService with WebHookService with OwnerAuthenticator with UsersAuthenticator -trait RepositorySettingsControllerBase extends ControllerBase with FlashMapSupport { +trait RepositorySettingsControllerBase extends ControllerBase { self: RepositoryService with AccountService with WebHookService with OwnerAuthenticator with UsersAuthenticator => diff --git a/src/main/scala/app/SystemSettingsController.scala b/src/main/scala/app/SystemSettingsController.scala index 08231b6da..c6f56fe34 100644 --- a/src/main/scala/app/SystemSettingsController.scala +++ b/src/main/scala/app/SystemSettingsController.scala @@ -4,12 +4,11 @@ import service.{AccountService, SystemSettingsService} import SystemSettingsService._ import util.AdminAuthenticator import jp.sf.amateras.scalatra.forms._ -import org.scalatra.FlashMapSupport class SystemSettingsController extends SystemSettingsControllerBase with SystemSettingsService with AccountService with AdminAuthenticator -trait SystemSettingsControllerBase extends ControllerBase with FlashMapSupport { +trait SystemSettingsControllerBase extends ControllerBase { self: SystemSettingsService with AccountService with AdminAuthenticator => private val form = mapping( diff --git a/src/main/scala/app/WikiController.scala b/src/main/scala/app/WikiController.scala index 704ce20a8..07208a5dd 100644 --- a/src/main/scala/app/WikiController.scala +++ b/src/main/scala/app/WikiController.scala @@ -6,18 +6,15 @@ import util.Directory._ import util.ControlUtil._ import jp.sf.amateras.scalatra.forms._ import org.eclipse.jgit.api.Git -import org.scalatra.FlashMapSupport import org.scalatra.i18n.Messages import scala.Some import java.util.ResourceBundle class WikiController extends WikiControllerBase - with WikiService with RepositoryService with AccountService with ActivityService - with CollaboratorsAuthenticator with ReferrerAuthenticator + with WikiService with RepositoryService with AccountService with ActivityService with CollaboratorsAuthenticator with ReferrerAuthenticator -trait WikiControllerBase extends ControllerBase with FlashMapSupport { - self: WikiService with RepositoryService with ActivityService - with CollaboratorsAuthenticator with ReferrerAuthenticator => +trait WikiControllerBase extends ControllerBase { + self: WikiService with RepositoryService with ActivityService with CollaboratorsAuthenticator with ReferrerAuthenticator => case class WikiPageEditForm(pageName: String, content: String, message: Option[String], currentPageName: String, id: String) From 17f581f654bad4fcb52f377f9246a7c778b63f2a Mon Sep 17 00:00:00 2001 From: takezoe Date: Sat, 1 Mar 2014 15:19:42 +0900 Subject: [PATCH 07/47] (refs #279)Override ScalatraBase#fullUrl() to apply the configured base url to redirection. --- src/main/scala/app/ControllerBase.scala | 16 +++++++++++----- src/main/scala/app/IndexController.scala | 6 ++---- 2 files changed, 13 insertions(+), 9 deletions(-) diff --git a/src/main/scala/app/ControllerBase.scala b/src/main/scala/app/ControllerBase.scala index d1e39e8bd..cf91fea25 100644 --- a/src/main/scala/app/ControllerBase.scala +++ b/src/main/scala/app/ControllerBase.scala @@ -103,15 +103,21 @@ abstract class ControllerBase extends ScalatraFilter if(request.getMethod.toUpperCase == "POST"){ org.scalatra.Unauthorized(redirect("/signin")) } else { - val currentUrl = baseUrl + defining(request.getQueryString){ queryString => - request.getRequestURI.substring(request.getContextPath.length) + (if(queryString != null) "?" + queryString else "") - } - session.setAttribute(Keys.Session.Redirect, currentUrl) - org.scalatra.Unauthorized(redirect("/signin")) + org.scalatra.Unauthorized(redirect("/signin?redirect=" + StringUtil.urlEncode( + defining(request.getQueryString){ queryString => + request.getRequestURI.substring(request.getContextPath.length) + (if(queryString != null) "?" + queryString else "") + } + ))) } } } + override def fullUrl(path: String, params: Iterable[(String, Any)] = Iterable.empty, + includeContextPath: Boolean = true, includeServletPath: Boolean = true) + (implicit request: HttpServletRequest, response: HttpServletResponse) = + if (path.startsWith("http")) path + else baseUrl + url(path, params, includeContextPath, includeServletPath) + } /** diff --git a/src/main/scala/app/IndexController.scala b/src/main/scala/app/IndexController.scala index 92ee29159..0e46b3c46 100644 --- a/src/main/scala/app/IndexController.scala +++ b/src/main/scala/app/IndexController.scala @@ -1,7 +1,6 @@ package app import util._ -import util.Implicits._ import service._ import jp.sf.amateras.scalatra.forms._ @@ -31,8 +30,7 @@ trait IndexControllerBase extends ControllerBase { get("/signin"){ val redirect = params.get("redirect") if(redirect.isDefined && redirect.get.startsWith("/")){ - - session.setAttribute(Keys.Session.Redirect, redirect.get) + flash += Keys.Flash.Redirect -> redirect.get } html.signin(loadSystemSettings()) } @@ -56,7 +54,7 @@ trait IndexControllerBase extends ControllerBase { session.setAttribute(Keys.Session.LoginAccount, account) updateLastLoginDate(account.userName) - session.getAndRemove[String](Keys.Session.Redirect).map { redirectUrl => + flash.get(Keys.Flash.Redirect).asInstanceOf[Option[String]].map { redirectUrl => if(redirectUrl.replaceFirst("/$", "") == request.getContextPath){ redirect("/") } else { From 374893a5aed0dab2715469c2fd04518db1a14c2f Mon Sep 17 00:00:00 2001 From: takezoe Date: Sat, 1 Mar 2014 15:22:58 +0900 Subject: [PATCH 08/47] Apply scala.util.control.Exception to exception handling. --- src/main/scala/util/ControlUtil.scala | 6 ++---- src/main/scala/util/Implicits.scala | 7 +++---- src/main/scala/util/Keys.scala | 21 +++++++++++++++------ 3 files changed, 20 insertions(+), 14 deletions(-) diff --git a/src/main/scala/util/ControlUtil.scala b/src/main/scala/util/ControlUtil.scala index 02d7fd189..af8db88e0 100644 --- a/src/main/scala/util/ControlUtil.scala +++ b/src/main/scala/util/ControlUtil.scala @@ -3,7 +3,7 @@ package util import org.eclipse.jgit.api.Git import org.eclipse.jgit.revwalk.RevWalk import org.eclipse.jgit.treewalk.TreeWalk -import org.eclipse.jgit.transport.RefSpec +import scala.util.control.Exception._ import scala.language.reflectiveCalls /** @@ -16,10 +16,8 @@ object ControlUtil { def using[A <% { def close(): Unit }, B](resource: A)(f: A => B): B = try f(resource) finally { if(resource != null){ - try { + allCatch { resource.close() - } catch { - case e: Throwable => // ignore } } } diff --git a/src/main/scala/util/Implicits.scala b/src/main/scala/util/Implicits.scala index a9e648c45..77c095ef9 100644 --- a/src/main/scala/util/Implicits.scala +++ b/src/main/scala/util/Implicits.scala @@ -1,6 +1,7 @@ package util import scala.util.matching.Regex +import scala.util.control.Exception._ import javax.servlet.http.{HttpSession, HttpServletRequest} /** @@ -42,10 +43,8 @@ object Implicits { sb.toString } - def toIntOpt: Option[Int] = try { - Option(Integer.parseInt(value)) - } catch { - case e: NumberFormatException => None + def toIntOpt: Option[Int] = catching(classOf[NumberFormatException]) opt { + Integer.parseInt(value) } } diff --git a/src/main/scala/util/Keys.scala b/src/main/scala/util/Keys.scala index 4aabe3555..920dfca3a 100644 --- a/src/main/scala/util/Keys.scala +++ b/src/main/scala/util/Keys.scala @@ -13,12 +13,7 @@ object Keys { /** * Session key for the logged in account information. */ - val LoginAccount = "LOGIN_ACCOUNT" - - /** - * Session key for the redirect URL. - */ - val Redirect = "REDIRECT" + val LoginAccount = "loginAccount" /** * Session key for the issue search condition in dashboard. @@ -47,6 +42,20 @@ object Keys { } + object Flash { + + /** + * Flash key for the redirect URL. + */ + val Redirect = "redirect" + + /** + * Flash key for the information message. + */ + val Info = "info" + + } + /** * Define request keys. */ From e97b5c3c89cc8f9711ea40d5bce58ec51537e186 Mon Sep 17 00:00:00 2001 From: takezoe Date: Sat, 1 Mar 2014 15:24:55 +0900 Subject: [PATCH 09/47] (refs #279)Remove --https option because it's possible to substitute in the base url configuration. --- README.md | 4 ++-- src/main/java/JettyLauncher.java | 20 +------------------- 2 files changed, 3 insertions(+), 21 deletions(-) diff --git a/README.md b/README.md index fa6718dc6..6ccf9af0d 100644 --- a/README.md +++ b/README.md @@ -42,7 +42,6 @@ or you can start GitBucket by `java -jar gitbucket.war` without servlet containe - --port=[NUMBER] - --prefix=[CONTEXTPATH] - --host=[HOSTNAME] -- --https=true - --gitbucket.home=[DATA_DIR] To upgrade GitBucket, only replace gitbucket.war. All GitBucket data is stored in HOME/.gitbucket. So if you want to back up GitBucket data, copy this directory to the other disk. @@ -60,7 +59,8 @@ Run the following commands in `Terminal` to Release Notes -------- ### 1.11 - End of Feb 2014 -- Base URL for redirect, notification and repository URL box is configurable +- Base URL for redirection, notification and repository URL box is configurable +- Remove ```--https``` option because it's possible to substitute in the base url - Headline anchor is available for Markdown contents such as Wiki page - Improve H2 connectivity - Label is available for pull requests not only issues diff --git a/src/main/java/JettyLauncher.java b/src/main/java/JettyLauncher.java index d7b137d6f..76500f045 100644 --- a/src/main/java/JettyLauncher.java +++ b/src/main/java/JettyLauncher.java @@ -25,8 +25,6 @@ public class JettyLauncher { port = Integer.parseInt(dim[1]); } else if(dim[0].equals("--prefix")) { contextPath = dim[1]; - } else if(dim[0].equals("--https") && (dim[1].equals("1") || dim[1].equals("true"))) { - forceHttps = true; } else if(dim[0].equals("--gitbucket.home")){ System.setProperty("gitbucket.home", dim[1]); } @@ -36,7 +34,7 @@ public class JettyLauncher { Server server = new Server(); - HttpsSupportConnector connector = new HttpsSupportConnector(forceHttps); + SelectChannelConnector connector = new SelectChannelConnector(); if(host != null) { connector.setHost(host); } @@ -62,19 +60,3 @@ public class JettyLauncher { server.join(); } } - -class HttpsSupportConnector extends SelectChannelConnector { - private boolean forceHttps; - - public HttpsSupportConnector(boolean forceHttps) { - this.forceHttps = forceHttps; - } - - @Override - public void customize(final EndPoint endpoint, final Request request) throws IOException { - if (this.forceHttps) { - request.setScheme("https"); - super.customize(endpoint, request); - } - } -} From 153244c3904b676441bb13b2fddf68c0257f60b1 Mon Sep 17 00:00:00 2001 From: takezoe Date: Sat, 1 Mar 2014 15:26:10 +0900 Subject: [PATCH 10/47] Update README.mf for GitBucket 1.11 release --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 6ccf9af0d..41c57d1a8 100644 --- a/README.md +++ b/README.md @@ -58,7 +58,7 @@ Run the following commands in `Terminal` to Release Notes -------- -### 1.11 - End of Feb 2014 +### 1.11 - 01 Mar 2014 - Base URL for redirection, notification and repository URL box is configurable - Remove ```--https``` option because it's possible to substitute in the base url - Headline anchor is available for Markdown contents such as Wiki page From 31b21d74b112fea8b3527bae2dfb747e2b2815ac Mon Sep 17 00:00:00 2001 From: takezoe Date: Sun, 2 Mar 2014 00:25:56 +0900 Subject: [PATCH 11/47] Remove --https option. --- contrib/redhat/gitbucket.conf | 3 --- contrib/redhat/gitbucket.init | 3 --- 2 files changed, 6 deletions(-) diff --git a/contrib/redhat/gitbucket.conf b/contrib/redhat/gitbucket.conf index c3959f36e..103778ec6 100644 --- a/contrib/redhat/gitbucket.conf +++ b/contrib/redhat/gitbucket.conf @@ -4,9 +4,6 @@ # Server port #GITBUCKET_PORT=8080 -# Force HTTPS scheme -#GITBUCKET_HTTPS=false - # Data directory (GITBUCKET_HOME/gitbucket) #GITBUCKET_HOME=/var/lib/gitbucket diff --git a/contrib/redhat/gitbucket.init b/contrib/redhat/gitbucket.init index 3aed80262..43e29e3e9 100644 --- a/contrib/redhat/gitbucket.init +++ b/contrib/redhat/gitbucket.init @@ -39,9 +39,6 @@ start() { if [ $GITBUCKET_HOST ]; then START_OPTS="${START_OPTS} --host=${GITBUCKET_HOST}" fi - if [ $GITBUCKET_HTTPS ]; then - START_OPTS="${START_OPTS} --https=true" - fi # Run the Java process GITBUCKET_HOME="${GITBUCKET_HOME}" java $GITBUCKET_JVM_OPTS -jar $GITBUCKET_WAR_FILE $START_OPTS >>$LOG_FILE 2>&1 & From 0fa1922bb060bfa18cea32bfdf8db7e839e0470e Mon Sep 17 00:00:00 2001 From: takezoe Date: Sun, 2 Mar 2014 01:05:42 +0900 Subject: [PATCH 12/47] Small fix to pull request #289 --- src/main/twirl/header.scala.html | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/src/main/twirl/header.scala.html b/src/main/twirl/header.scala.html index 965fa9381..55f19eec9 100644 --- a/src/main/twirl/header.scala.html +++ b/src/main/twirl/header.scala.html @@ -29,13 +29,10 @@ } } - - - @if(repository.repository.description != "") { -

@repository.repository.description

- } - +@repository.repository.description.map { description => +

@description

+}
From 94576a876a716818b6da89a3b2f6e9acb7c4da21 Mon Sep 17 00:00:00 2001 From: takezoe Date: Sun, 2 Mar 2014 01:23:30 +0900 Subject: [PATCH 13/47] (refs #280)Commit count limitation is changed to 10000 from 1000. --- src/main/scala/util/JGitUtil.scala | 2 +- src/main/twirl/repo/files.scala.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/scala/util/JGitUtil.scala b/src/main/scala/util/JGitUtil.scala index 742641e62..57fd42192 100644 --- a/src/main/scala/util/JGitUtil.scala +++ b/src/main/scala/util/JGitUtil.scala @@ -128,7 +128,7 @@ object JGitUtil { using(Git.open(getRepositoryDir(owner, repository))){ git => try { // get commit count - val commitCount = git.log.all.call.iterator.asScala.map(_ => 1).take(1000).sum + val commitCount = git.log.all.call.iterator.asScala.map(_ => 1).take(10000).sum RepositoryInfo( owner, repository, s"${baseUrl}/git/${owner}/${repository}.git", diff --git a/src/main/twirl/repo/files.scala.html b/src/main/twirl/repo/files.scala.html index 823298ec7..355a393c0 100644 --- a/src/main/twirl/repo/files.scala.html +++ b/src/main/twirl/repo/files.scala.html @@ -12,7 +12,7 @@
@defining(repository.commitCount){ commitCount => - @if(commitCount > 1000){ @commitCount+ } else { @commitCount } @plural(commitCount, "commit")  + @if(commitCount > 10000){ @commitCount+ } else { @commitCount } @plural(commitCount, "commit")  }
@repository.name / From 7701521a2e0fe80986fc2a4b6c8f64ed7cd7b50b Mon Sep 17 00:00:00 2001 From: takezoe Date: Sun, 2 Mar 2014 04:24:24 +0900 Subject: [PATCH 14/47] Fix to use Exception#ignoring to ignore Exception. --- src/main/scala/util/ControlUtil.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/scala/util/ControlUtil.scala b/src/main/scala/util/ControlUtil.scala index af8db88e0..0b0f7123b 100644 --- a/src/main/scala/util/ControlUtil.scala +++ b/src/main/scala/util/ControlUtil.scala @@ -16,7 +16,7 @@ object ControlUtil { def using[A <% { def close(): Unit }, B](resource: A)(f: A => B): B = try f(resource) finally { if(resource != null){ - allCatch { + ignoring(classOf[Throwable]) { resource.close() } } From b031103df8d7109f727a1dfc903f4c6caf93e011 Mon Sep 17 00:00:00 2001 From: takezoe Date: Sun, 2 Mar 2014 04:49:14 +0900 Subject: [PATCH 15/47] (refs #218)Separate StringUtil#extractCloseId() to add unit test. --- .../scala/app/PullRequestsController.scala | 2 +- src/main/scala/service/IssuesService.scala | 13 +++++-------- .../scala/servlet/GitRepositoryServlet.scala | 2 +- src/main/scala/util/StringUtil.scala | 15 ++++++++++++--- src/test/scala/util/StringUtilSpec.scala | 18 ++++++++++++++++++ 5 files changed, 37 insertions(+), 13 deletions(-) diff --git a/src/main/scala/app/PullRequestsController.scala b/src/main/scala/app/PullRequestsController.scala index 5a3317dc2..bf3bea268 100644 --- a/src/main/scala/app/PullRequestsController.scala +++ b/src/main/scala/app/PullRequestsController.scala @@ -79,7 +79,7 @@ trait PullRequestsControllerBase extends ControllerBase { pulls.html.pullreq( issue, pullreq, getComments(owner, name, issueId), - getIssueLabels(owner, name, issueId.toInt), + getIssueLabels(owner, name, issueId), (getCollaborators(owner, name) ::: (if(getAccountByUserName(owner).get.isGroupAccount) Nil else List(owner))).sorted, getMilestonesWithIssueCount(owner, name), getLabels(owner, name), diff --git a/src/main/scala/service/IssuesService.scala b/src/main/scala/service/IssuesService.scala index 81a9bf85e..b1215995f 100644 --- a/src/main/scala/service/IssuesService.scala +++ b/src/main/scala/service/IssuesService.scala @@ -8,6 +8,7 @@ import Q.interpolation import model._ import util.Implicits._ import util.StringUtil._ +import util.StringUtil trait IssuesService { import IssuesService._ @@ -315,14 +316,10 @@ trait IssuesService { } def closeIssuesFromMessage(message: String, userName: String, owner: String, repository: String) = { - val regex = "(?i)(? - getIssue(owner, repository, issueId) match { - case Some(issue) if !issue.closed => { - createComment(owner, repository, userName, issue.issueId, "Close", "close") - updateClosed(owner, repository, issue.issueId, true) - } - case _ => + StringUtil.extractCloseId(message).foreach { issueId => + for(issue <- getIssue(owner, repository, issueId) if !issue.closed){ + createComment(owner, repository, userName, issue.issueId, "Close", "close") + updateClosed(owner, repository, issue.issueId, true) } } } diff --git a/src/main/scala/servlet/GitRepositoryServlet.scala b/src/main/scala/servlet/GitRepositoryServlet.scala index e1a00d783..9efefd35f 100644 --- a/src/main/scala/servlet/GitRepositoryServlet.scala +++ b/src/main/scala/servlet/GitRepositoryServlet.scala @@ -142,7 +142,7 @@ class CommitLogHook(owner: String, repository: String, pusher: String, baseUrl: } // close issues - val defaultBranch = getRepository(owner, repository, baseURL).get.repository.defaultBranch + val defaultBranch = getRepository(owner, repository, baseUrl).get.repository.defaultBranch if(refName(1) == "heads" && branchName == defaultBranch && command.getType == ReceiveCommand.Type.UPDATE){ git.log.addRange(command.getOldId, command.getNewId).call.asScala.foreach { commit => closeIssuesFromMessage(commit.getFullMessage, pusher, owner, repository) diff --git a/src/main/scala/util/StringUtil.scala b/src/main/scala/util/StringUtil.scala index 7de2a62d6..54da0294d 100644 --- a/src/main/scala/util/StringUtil.scala +++ b/src/main/scala/util/StringUtil.scala @@ -31,7 +31,7 @@ object StringUtil { /** * Make string from byte array. Character encoding is detected automatically by [[util.StringUtil.detectEncoding]]. - * And if given bytes contains UTF-8 BOM, it's removed from returned string.. + * And if given bytes contains UTF-8 BOM, it's removed from returned string. */ def convertFromByteArray(content: Array[Byte]): String = IOUtils.toString(new BOMInputStream(new java.io.ByteArrayInputStream(content)), detectEncoding(content)) @@ -47,12 +47,21 @@ object StringUtil { } /** - * Extract issue id like ````#issueId``` from the given message. + * Extract issue id like ```#issueId``` from the given message. * *@param message the message which may contains issue id * @return the iterator of issue id */ def extractIssueId(message: String): Iterator[String] = - "(^|\\W)#(\\d+)(\\W|$)".r.findAllIn(message).matchData.map { matchData => matchData.group(2) } + "(^|\\W)#(\\d+)(\\W|$)".r.findAllIn(message).matchData.map(_.group(2)) + + /** + * Extract close issue id like ```close #issueId ``` from the given message. + * + * @param message the message which may contains close command + * @return the iterator of issue id + */ + def extractCloseId(message: String): Iterator[String] = + "(?i)(? Date: Sun, 2 Mar 2014 23:55:03 +0900 Subject: [PATCH 16/47] (refs #279)Fix redirect url generation. --- src/main/scala/app/ControllerBase.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/scala/app/ControllerBase.scala b/src/main/scala/app/ControllerBase.scala index cf91fea25..5e60eb42c 100644 --- a/src/main/scala/app/ControllerBase.scala +++ b/src/main/scala/app/ControllerBase.scala @@ -116,7 +116,7 @@ abstract class ControllerBase extends ScalatraFilter includeContextPath: Boolean = true, includeServletPath: Boolean = true) (implicit request: HttpServletRequest, response: HttpServletResponse) = if (path.startsWith("http")) path - else baseUrl + url(path, params, includeContextPath, includeServletPath) + else baseUrl + url(path, params, false, false) } From 527fd94145f86f5e72f07133e1d71d4deb7847a4 Mon Sep 17 00:00:00 2001 From: eiryu Date: Mon, 3 Mar 2014 00:28:48 +0900 Subject: [PATCH 17/47] fix typo --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 41c57d1a8..43470be57 100644 --- a/README.md +++ b/README.md @@ -23,7 +23,7 @@ Following features are not implemented, but we will make them in the future rele - File editing in repository viewer - Comment for the changeset - Network graph -- Statics +- Statistics - Watch / Star If you want to try the development version of GitBucket, see the documentation for developers at [Wiki](https://github.com/takezoe/gitbucket/wiki). From 270eb7cf1ddbd2111df19dad56b7d61fdd8c4bc5 Mon Sep 17 00:00:00 2001 From: takezoe Date: Mon, 3 Mar 2014 01:17:52 +0900 Subject: [PATCH 18/47] (refs #198)Allow create group by normal users. --- .../app/CreateRepositoryController.scala | 96 ++++++++++++-- src/main/twirl/account/main.scala.html | 7 + src/main/twirl/group.scala.html | 121 ++++++++++++++++++ src/main/twirl/main.scala.html | 6 +- 4 files changed, 217 insertions(+), 13 deletions(-) create mode 100644 src/main/twirl/group.scala.html diff --git a/src/main/scala/app/CreateRepositoryController.scala b/src/main/scala/app/CreateRepositoryController.scala index 16cd05c95..90e9ac3ae 100644 --- a/src/main/scala/app/CreateRepositoryController.scala +++ b/src/main/scala/app/CreateRepositoryController.scala @@ -9,35 +9,59 @@ import jp.sf.amateras.scalatra.forms._ import org.eclipse.jgit.lib.{FileMode, Constants} import org.eclipse.jgit.dircache.DirCache import org.scalatra.i18n.Messages +import org.apache.commons.io.FileUtils class CreateRepositoryController extends CreateRepositoryControllerBase with RepositoryService with AccountService with WikiService with LabelsService with ActivityService with UsersAuthenticator with ReadableUsersAuthenticator /** - * Creates new repository. + * Creates new repository or group. */ -trait CreateRepositoryControllerBase extends ControllerBase { +trait CreateRepositoryControllerBase extends AccountManagementControllerBase { self: RepositoryService with AccountService with WikiService with LabelsService with ActivityService with UsersAuthenticator with ReadableUsersAuthenticator => - case class RepositoryCreationForm(owner: String, name: String, description: Option[String], isPrivate: Boolean, createReadme: Boolean) + case class RepositoryCreationForm(owner: String, name: String, description: Option[String], + isPrivate: Boolean, createReadme: Boolean) case class ForkRepositoryForm(owner: String, name: String) - val newForm = mapping( + val newRepositoryForm = mapping( "owner" -> trim(label("Owner" , text(required, maxlength(40), identifier, existsAccount))), - "name" -> trim(label("Repository name", text(required, maxlength(40), identifier, unique))), + "name" -> trim(label("Repository name", text(required, maxlength(40), identifier, uniqueRepository))), "description" -> trim(label("Description" , optional(text()))), "isPrivate" -> trim(label("Repository Type", boolean())), "createReadme" -> trim(label("Create README" , boolean())) )(RepositoryCreationForm.apply) - val forkForm = mapping( + val forkRepositoryForm = mapping( "owner" -> trim(label("Repository owner", text(required))), "name" -> trim(label("Repository name", text(required))) )(ForkRepositoryForm.apply) + case class NewGroupForm(groupName: String, url: Option[String], fileId: Option[String], + memberNames: Option[String]) + + case class EditGroupForm(groupName: String, url: Option[String], fileId: Option[String], + memberNames: Option[String], clearImage: Boolean, isRemoved: Boolean) + + val newGroupForm = mapping( + "groupName" -> trim(label("Group name" ,text(required, maxlength(100), identifier, uniqueUserName))), + "url" -> trim(label("URL" ,optional(text(maxlength(200))))), + "fileId" -> trim(label("File ID" ,optional(text()))), + "memberNames" -> trim(label("Member Names" ,optional(text()))) + )(NewGroupForm.apply) + + val editGroupForm = mapping( + "groupName" -> trim(label("Group name" ,text(required, maxlength(100), identifier))), + "url" -> trim(label("URL" ,optional(text(maxlength(200))))), + "fileId" -> trim(label("File ID" ,optional(text()))), + "memberNames" -> trim(label("Member Names" ,optional(text()))), + "clearImage" -> trim(label("Clear image" ,boolean())), + "removed" -> trim(label("Disable" ,boolean())) + )(EditGroupForm.apply) + /** * Show the new repository form. */ @@ -48,7 +72,7 @@ trait CreateRepositoryControllerBase extends ControllerBase { /** * Create new repository. */ - post("/new", newForm)(usersOnly { form => + post("/new", newRepositoryForm)(usersOnly { form => LockUtil.lock(s"${form.owner}/${form.name}/create"){ if(getRepository(form.owner, form.name, baseUrl).isEmpty){ val ownerAccount = getAccountByUserName(form.owner).get @@ -172,6 +196,57 @@ trait CreateRepositoryControllerBase extends ControllerBase { } }) + get("/groups/new")(usersOnly { + html.group(None, Nil) + }) + + post("/groups/new", newGroupForm)(usersOnly { form => + createGroup(form.groupName, form.url) + updateGroupMembers(form.groupName, form.memberNames.map(_.split(",").toList).getOrElse(Nil)) + updateImage(form.groupName, form.fileId, false) + redirect(s"/${form.groupName}") + }) + + get("/:groupName/_edit")(usersOnly { // TODO group manager only + defining(params("groupName")){ groupName => + html.group(getAccountByUserName(groupName, true), getGroupMembers(groupName)) + } + }) + + post("/:groupName/_edit", editGroupForm)(usersOnly { form => // TODO group manager only + defining(params("groupName"), form.memberNames.map(_.split(",").toList).getOrElse(Nil)){ case (groupName, memberNames) => + getAccountByUserName(groupName, true).map { account => + updateGroup(groupName, form.url, form.isRemoved) + + if(form.isRemoved){ + // Remove from GROUP_MEMBER + updateGroupMembers(form.groupName, Nil) + // Remove repositories + getRepositoryNamesOfUser(form.groupName).foreach { repositoryName => + deleteRepository(groupName, repositoryName) + FileUtils.deleteDirectory(getRepositoryDir(groupName, repositoryName)) + FileUtils.deleteDirectory(getWikiRepositoryDir(groupName, repositoryName)) + FileUtils.deleteDirectory(getTemporaryDir(groupName, repositoryName)) + } + } else { + // Update GROUP_MEMBER + updateGroupMembers(form.groupName, memberNames) + // Update COLLABORATOR for group repositories + getRepositoryNamesOfUser(form.groupName).foreach { repositoryName => + removeCollaborators(form.groupName, repositoryName) + memberNames.foreach { userName => + addCollaborator(form.groupName, repositoryName, userName) + } + } + } + + updateImage(form.groupName, form.fileId, form.clearImage) + redirect(s"/${form.groupName}") + + } getOrElse NotFound + } + }) + private def insertDefaultLabels(userName: String, repositoryName: String): Unit = { createLabel(userName, repositoryName, "bug", "fc2929") createLabel(userName, repositoryName, "duplicate", "cccccc") @@ -186,14 +261,11 @@ trait CreateRepositoryControllerBase extends ControllerBase { if(getAccountByUserName(value).isEmpty) Some("User or group does not exist.") else None } - /** - * Duplicate check for the repository name. - */ - private def unique: Constraint = new Constraint(){ + private def uniqueRepository: Constraint = new Constraint(){ override def validate(name: String, value: String, params: Map[String, String], messages: Messages): Option[String] = params.get("owner").flatMap { userName => getRepositoryNamesOfUser(userName).find(_ == value).map(_ => "Repository already exists.") } } - + } diff --git a/src/main/twirl/account/main.scala.html b/src/main/twirl/account/main.scala.html index 0b6cc6e6d..efc844102 100644 --- a/src/main/twirl/account/main.scala.html +++ b/src/main/twirl/account/main.scala.html @@ -41,6 +41,13 @@
} + @if(loginAccount.isDefined && account.isGroupAccount){ +
  • +
    + Edit Group +
    +
    • + } @body diff --git a/src/main/twirl/group.scala.html b/src/main/twirl/group.scala.html new file mode 100644 index 000000000..4cc5474a2 --- /dev/null +++ b/src/main/twirl/group.scala.html @@ -0,0 +1,121 @@ +@(account: Option[model.Account], members: List[String])(implicit context: app.Context) +@import context._ +@import view.helpers._ +@main("Create a group"){ +
    +
    +
    +
    +
    + +
    + +
    + + @if(account.isDefined){ + + } +
    +
    + +
    + +
    + +
    +
    + + @helper.html.uploadavatar(account) +
    +
    +
    +
    + + + @helper.html.account("memberName", 200) + + +
    + +
    +
    +
    +
    +
    + +
    +
    +
    +} + \ No newline at end of file diff --git a/src/main/twirl/main.scala.html b/src/main/twirl/main.scala.html index 7ec984289..5c08ab12a 100644 --- a/src/main/twirl/main.scala.html +++ b/src/main/twirl/main.scala.html @@ -54,7 +54,11 @@ } @if(loginAccount.isDefined){ @avatar(loginAccount.get.userName, 20) @loginAccount.get.userName - + + @if(loginAccount.get.isAdmin){ From d870896cfb4ee786b44a7df58196c7f85ae4a3f2 Mon Sep 17 00:00:00 2001 From: takezoe Date: Mon, 3 Mar 2014 01:21:22 +0900 Subject: [PATCH 19/47] Rename CreateRepositoryController to CreateController. --- src/main/scala/ScalatraBootstrap.scala | 2 +- ...reateRepositoryController.scala => CreateController.scala} | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) rename src/main/scala/app/{CreateRepositoryController.scala => CreateController.scala} (98%) diff --git a/src/main/scala/ScalatraBootstrap.scala b/src/main/scala/ScalatraBootstrap.scala index de3c40d04..b03456578 100644 --- a/src/main/scala/ScalatraBootstrap.scala +++ b/src/main/scala/ScalatraBootstrap.scala @@ -20,7 +20,7 @@ class ScalatraBootstrap extends LifeCycle { context.mount(new DashboardController, "/*") context.mount(new UserManagementController, "/*") context.mount(new SystemSettingsController, "/*") - context.mount(new CreateRepositoryController, "/*") + context.mount(new CreateController, "/*") context.mount(new AccountController, "/*") context.mount(new RepositoryViewerController, "/*") context.mount(new WikiController, "/*") diff --git a/src/main/scala/app/CreateRepositoryController.scala b/src/main/scala/app/CreateController.scala similarity index 98% rename from src/main/scala/app/CreateRepositoryController.scala rename to src/main/scala/app/CreateController.scala index 90e9ac3ae..022277ed7 100644 --- a/src/main/scala/app/CreateRepositoryController.scala +++ b/src/main/scala/app/CreateController.scala @@ -11,14 +11,14 @@ import org.eclipse.jgit.dircache.DirCache import org.scalatra.i18n.Messages import org.apache.commons.io.FileUtils -class CreateRepositoryController extends CreateRepositoryControllerBase +class CreateController extends CreateControllerBase with RepositoryService with AccountService with WikiService with LabelsService with ActivityService with UsersAuthenticator with ReadableUsersAuthenticator /** * Creates new repository or group. */ -trait CreateRepositoryControllerBase extends AccountManagementControllerBase { +trait CreateControllerBase extends AccountManagementControllerBase { self: RepositoryService with AccountService with WikiService with LabelsService with ActivityService with UsersAuthenticator with ReadableUsersAuthenticator => From 17920e119571e65d3731025e37a2b557bfb5f2f6 Mon Sep 17 00:00:00 2001 From: takezoe Date: Mon, 3 Mar 2014 01:45:00 +0900 Subject: [PATCH 20/47] (refs #198)Allow group editing by group members. --- src/main/scala/app/AccountController.scala | 14 ++++++++++---- src/main/scala/app/CreateController.scala | 8 ++++---- src/main/scala/util/Authenticator.scala | 19 +++++++++++++++++++ src/main/twirl/account/main.scala.html | 5 +++-- src/main/twirl/account/members.scala.html | 4 ++-- .../twirl/account/repositories.scala.html | 6 ++++-- src/main/twirl/group.scala.html | 2 +- 7 files changed, 43 insertions(+), 15 deletions(-) diff --git a/src/main/scala/app/AccountController.scala b/src/main/scala/app/AccountController.scala index df24aad3f..7fc358901 100644 --- a/src/main/scala/app/AccountController.scala +++ b/src/main/scala/app/AccountController.scala @@ -51,14 +51,20 @@ trait AccountControllerBase extends AccountManagementControllerBase { getActivitiesByUser(userName, true)) // Members - case "members" if(account.isGroupAccount) => - _root_.account.html.members(account, getGroupMembers(account.userName)) + case "members" if(account.isGroupAccount) => { + val members = getGroupMembers(account.userName) + _root_.account.html.members(account, members, + context.loginAccount.exists(x => members.contains(x.userName))) + } // Repositories - case _ => + case _ => { + val members = getGroupMembers(account.userName) _root_.account.html.repositories(account, if(account.isGroupAccount) Nil else getGroupsByUserName(userName), - getVisibleRepositories(context.loginAccount, baseUrl, Some(userName))) + getVisibleRepositories(context.loginAccount, baseUrl, Some(userName)), + context.loginAccount.exists(x => members.contains(x.userName))) + } } } getOrElse NotFound } diff --git a/src/main/scala/app/CreateController.scala b/src/main/scala/app/CreateController.scala index 022277ed7..ccfd37b20 100644 --- a/src/main/scala/app/CreateController.scala +++ b/src/main/scala/app/CreateController.scala @@ -13,14 +13,14 @@ import org.apache.commons.io.FileUtils class CreateController extends CreateControllerBase with RepositoryService with AccountService with WikiService with LabelsService with ActivityService - with UsersAuthenticator with ReadableUsersAuthenticator + with UsersAuthenticator with ReadableUsersAuthenticator with GroupMemberAuthenticator /** * Creates new repository or group. */ trait CreateControllerBase extends AccountManagementControllerBase { self: RepositoryService with AccountService with WikiService with LabelsService with ActivityService - with UsersAuthenticator with ReadableUsersAuthenticator => + with UsersAuthenticator with ReadableUsersAuthenticator with GroupMemberAuthenticator => case class RepositoryCreationForm(owner: String, name: String, description: Option[String], isPrivate: Boolean, createReadme: Boolean) @@ -207,13 +207,13 @@ trait CreateControllerBase extends AccountManagementControllerBase { redirect(s"/${form.groupName}") }) - get("/:groupName/_edit")(usersOnly { // TODO group manager only + get("/:groupName/_edit")(membersOnly { defining(params("groupName")){ groupName => html.group(getAccountByUserName(groupName, true), getGroupMembers(groupName)) } }) - post("/:groupName/_edit", editGroupForm)(usersOnly { form => // TODO group manager only + post("/:groupName/_edit", editGroupForm)(membersOnly { form => defining(params("groupName"), form.memberNames.map(_.split(",").toList).getOrElse(Nil)){ case (groupName, memberNames) => getAccountByUserName(groupName, true).map { account => updateGroup(groupName, form.url, form.isRemoved) diff --git a/src/main/scala/util/Authenticator.scala b/src/main/scala/util/Authenticator.scala index c5247137c..c43b0ec17 100644 --- a/src/main/scala/util/Authenticator.scala +++ b/src/main/scala/util/Authenticator.scala @@ -155,3 +155,22 @@ trait ReadableUsersAuthenticator { self: ControllerBase with RepositoryService = } } } + +/** + * Allows only the group members. + */ +trait GroupMemberAuthenticator { self: ControllerBase with AccountService => + protected def membersOnly(action: => Any) = { authenticate(action) } + protected def membersOnly[T](action: T => Any) = (form: T) => { authenticate(action(form)) } + + private def authenticate(action: => Any) = { + { + defining(request.paths){ paths => + context.loginAccount match { + case Some(x) if(getGroupMembers(paths(0)).contains(x.userName)) => action + case _ => Unauthorized() + } + } + } + } +} diff --git a/src/main/twirl/account/main.scala.html b/src/main/twirl/account/main.scala.html index efc844102..2cbe2577c 100644 --- a/src/main/twirl/account/main.scala.html +++ b/src/main/twirl/account/main.scala.html @@ -1,4 +1,5 @@ -@(account: model.Account, groupNames: List[String], active: String)(body: Html)(implicit context: app.Context) +@(account: model.Account, groupNames: List[String], active: String, + isGroupMember: Boolean = false)(body: Html)(implicit context: app.Context) @import context._ @import view.helpers._ @html.main(account.userName){ @@ -41,7 +42,7 @@ } - @if(loginAccount.isDefined && account.isGroupAccount){ + @if(loginAccount.isDefined && account.isGroupAccount && isGroupMember){
  • Edit Group diff --git a/src/main/twirl/account/members.scala.html b/src/main/twirl/account/members.scala.html index 14d7c773f..b69fc0af0 100644 --- a/src/main/twirl/account/members.scala.html +++ b/src/main/twirl/account/members.scala.html @@ -1,7 +1,7 @@ -@(account: model.Account, members: List[String])(implicit context: app.Context) +@(account: model.Account, members: List[String], isGroupMember: Boolean)(implicit context: app.Context) @import context._ @import view.helpers._ -@main(account, Nil, "members"){ +@main(account, Nil, "members", isGroupMember){ @if(members.isEmpty){ No members } else { diff --git a/src/main/twirl/account/repositories.scala.html b/src/main/twirl/account/repositories.scala.html index f9037f568..7772088ca 100644 --- a/src/main/twirl/account/repositories.scala.html +++ b/src/main/twirl/account/repositories.scala.html @@ -1,7 +1,9 @@ -@(account: model.Account, groupNames: List[String], repositories: List[service.RepositoryService.RepositoryInfo])(implicit context: app.Context) +@(account: model.Account, groupNames: List[String], + repositories: List[service.RepositoryService.RepositoryInfo], + isGroupMember: Boolean)(implicit context: app.Context) @import context._ @import view.helpers._ -@main(account, groupNames, "repositories"){ +@main(account, groupNames, "repositories", isGroupMember){ @if(repositories.isEmpty){ No repositories } else { diff --git a/src/main/twirl/group.scala.html b/src/main/twirl/group.scala.html index 4cc5474a2..ed70394e2 100644 --- a/src/main/twirl/group.scala.html +++ b/src/main/twirl/group.scala.html @@ -3,7 +3,7 @@ @import view.helpers._ @main("Create a group"){
    -
    +
    From 607c477e7dec6fe4020a432779343e6666b68412 Mon Sep 17 00:00:00 2001 From: takezoe Date: Tue, 4 Mar 2014 02:39:18 +0900 Subject: [PATCH 21/47] Add options for remote debugging --- sbt.bat | 2 +- sbt.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sbt.bat b/sbt.bat index d86d1e05b..41a5c115a 100644 --- a/sbt.bat +++ b/sbt.bat @@ -1,2 +1,2 @@ set SCRIPT_DIR=%~dp0 -java -Dsbt.log.noformat=true -XX:+CMSClassUnloadingEnabled -XX:MaxPermSize=256m -Xmx512M -Xss2M -jar "%SCRIPT_DIR%\sbt-launch-0.12.3.jar" %* +java -Dsbt.log.noformat=true -XX:+CMSClassUnloadingEnabled -XX:MaxPermSize=256m -Xmx512M -Xss2M -Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=5005 -jar "%SCRIPT_DIR%\sbt-launch-0.12.3.jar" %* diff --git a/sbt.sh b/sbt.sh index 23c721f7d..cd2266f44 100755 --- a/sbt.sh +++ b/sbt.sh @@ -1 +1 @@ -java -Dsbt.log.noformat=true -XX:+CMSClassUnloadingEnabled -XX:MaxPermSize=256m -Xmx512M -Xss2M -jar `dirname $0`/sbt-launch-0.12.3.jar "$@" +java -Dsbt.log.noformat=true -XX:+CMSClassUnloadingEnabled -XX:MaxPermSize=256m -Xmx512M -Xss2M -Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=5005 -jar `dirname $0`/sbt-launch-0.12.3.jar "$@" From 5cf96134d5b453a1620ac5b254ccd1d4ed3a9ffe Mon Sep 17 00:00:00 2001 From: takezoe Date: Tue, 4 Mar 2014 03:25:18 +0900 Subject: [PATCH 22/47] (refs #296)Fix redirection path generation again --- src/main/scala/app/ControllerBase.scala | 9 ++++++++- src/main/twirl/main.scala.html | 3 +-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/src/main/scala/app/ControllerBase.scala b/src/main/scala/app/ControllerBase.scala index 5e60eb42c..81e1dca83 100644 --- a/src/main/scala/app/ControllerBase.scala +++ b/src/main/scala/app/ControllerBase.scala @@ -38,12 +38,15 @@ abstract class ControllerBase extends ScalatraFilter val account = httpRequest.getSession.getAttribute(Keys.Session.LoginAccount).asInstanceOf[Account] if(account == null){ // Redirect to login form + // TODO Should use the configured base url. httpResponse.sendRedirect(context + "/signin?" + StringUtil.urlEncode(path)) } else if(account.isAdmin){ // H2 Console (administrators only) + // TODO Should use the configured base url. chain.doFilter(request, response) } else { // Redirect to dashboard + // TODO Should use the configured base url. httpResponse.sendRedirect(context + "/") } } else if(path.startsWith("/git/")){ @@ -116,15 +119,19 @@ abstract class ControllerBase extends ScalatraFilter includeContextPath: Boolean = true, includeServletPath: Boolean = true) (implicit request: HttpServletRequest, response: HttpServletResponse) = if (path.startsWith("http")) path - else baseUrl + url(path, params, false, false) + else baseUrl + url(path, params, false, false, false) } /** * Context object for the current request. + * + * @param path the context path */ case class Context(path: String, loginAccount: Option[Account], request: HttpServletRequest){ + lazy val currentPath = request.getRequestURI.substring(path.length) + /** * Get object from cache. * diff --git a/src/main/twirl/main.scala.html b/src/main/twirl/main.scala.html index 7ec984289..0d73555ea 100644 --- a/src/main/twirl/main.scala.html +++ b/src/main/twirl/main.scala.html @@ -61,7 +61,7 @@ } } else { - Sign in + Sign in }
    @@ -76,7 +76,6 @@ $('#search').submit(function(){ return $.trim($(this).find('input[name=query]').val()) != ''; }); - $('#signin').attr('href', '@path/signin?redirect=' + encodeURIComponent(location.pathname + location.search + location.hash)); }); From e3fd564efd874c2b2f419cdb72db2ab95f73255d Mon Sep 17 00:00:00 2001 From: takezoe Date: Tue, 4 Mar 2014 04:25:44 +0900 Subject: [PATCH 23/47] (refs #241)Work for specifying group manager --- src/main/resources/update/1_12.sql | 1 + src/main/scala/app/AccountController.scala | 6 ++--- src/main/scala/app/CreateController.scala | 26 ++++++++++++------- .../scala/app/UserManagementController.scala | 18 +++++++++---- src/main/scala/model/GroupMembers.scala | 6 +++-- src/main/scala/service/AccountService.scala | 10 +++---- .../scala/servlet/AutoUpdateListener.scala | 1 + src/main/scala/util/Authenticator.scala | 10 +++---- src/main/twirl/account/main.scala.html | 4 +-- src/main/twirl/account/members.scala.html | 4 +-- .../twirl/account/repositories.scala.html | 4 +-- src/main/twirl/admin/users/group.scala.html | 4 +-- src/main/twirl/group.scala.html | 12 ++++++--- 13 files changed, 65 insertions(+), 41 deletions(-) create mode 100644 src/main/resources/update/1_12.sql diff --git a/src/main/resources/update/1_12.sql b/src/main/resources/update/1_12.sql new file mode 100644 index 000000000..00301693c --- /dev/null +++ b/src/main/resources/update/1_12.sql @@ -0,0 +1 @@ +ALTER TABLE GROUP_MEMBER ADD COLUMN MANAGER BOOLEAN DEFAULT FALSE; \ No newline at end of file diff --git a/src/main/scala/app/AccountController.scala b/src/main/scala/app/AccountController.scala index 7fc358901..e1c293f77 100644 --- a/src/main/scala/app/AccountController.scala +++ b/src/main/scala/app/AccountController.scala @@ -53,8 +53,8 @@ trait AccountControllerBase extends AccountManagementControllerBase { // Members case "members" if(account.isGroupAccount) => { val members = getGroupMembers(account.userName) - _root_.account.html.members(account, members, - context.loginAccount.exists(x => members.contains(x.userName))) + _root_.account.html.members(account, members.map(_._1), + context.loginAccount.exists(x => members.exists { case (userName, isManager) => userName == x.userName && isManager })) } // Repositories @@ -63,7 +63,7 @@ trait AccountControllerBase extends AccountManagementControllerBase { _root_.account.html.repositories(account, if(account.isGroupAccount) Nil else getGroupsByUserName(userName), getVisibleRepositories(context.loginAccount, baseUrl, Some(userName)), - context.loginAccount.exists(x => members.contains(x.userName))) + context.loginAccount.exists(x => members.exists { case (userName, isManager) => userName == x.userName && isManager })) } } } getOrElse NotFound diff --git a/src/main/scala/app/CreateController.scala b/src/main/scala/app/CreateController.scala index ccfd37b20..7b2acbb4b 100644 --- a/src/main/scala/app/CreateController.scala +++ b/src/main/scala/app/CreateController.scala @@ -13,14 +13,14 @@ import org.apache.commons.io.FileUtils class CreateController extends CreateControllerBase with RepositoryService with AccountService with WikiService with LabelsService with ActivityService - with UsersAuthenticator with ReadableUsersAuthenticator with GroupMemberAuthenticator + with UsersAuthenticator with ReadableUsersAuthenticator with GroupManagerAuthenticator /** * Creates new repository or group. */ trait CreateControllerBase extends AccountManagementControllerBase { self: RepositoryService with AccountService with WikiService with LabelsService with ActivityService - with UsersAuthenticator with ReadableUsersAuthenticator with GroupMemberAuthenticator => + with UsersAuthenticator with ReadableUsersAuthenticator with GroupManagerAuthenticator => case class RepositoryCreationForm(owner: String, name: String, description: Option[String], isPrivate: Boolean, createReadme: Boolean) @@ -84,7 +84,7 @@ trait CreateControllerBase extends AccountManagementControllerBase { // Add collaborators for group repository if(ownerAccount.isGroupAccount){ - getGroupMembers(form.owner).foreach { userName => + getGroupMembers(form.owner).foreach { case (userName, isManager) => addCollaborator(form.owner, form.name, userName) } } @@ -202,19 +202,27 @@ trait CreateControllerBase extends AccountManagementControllerBase { post("/groups/new", newGroupForm)(usersOnly { form => createGroup(form.groupName, form.url) - updateGroupMembers(form.groupName, form.memberNames.map(_.split(",").toList).getOrElse(Nil)) + updateGroupMembers(form.groupName, form.memberNames.map(_.split(",").map { + _.split(":") match { + case Array(userName, isManager) => (userName, isManager.toBoolean) + } + }.toList).getOrElse(Nil)) updateImage(form.groupName, form.fileId, false) redirect(s"/${form.groupName}") }) - get("/:groupName/_edit")(membersOnly { + get("/:groupName/_edit")(managersOnly { defining(params("groupName")){ groupName => html.group(getAccountByUserName(groupName, true), getGroupMembers(groupName)) } }) - post("/:groupName/_edit", editGroupForm)(membersOnly { form => - defining(params("groupName"), form.memberNames.map(_.split(",").toList).getOrElse(Nil)){ case (groupName, memberNames) => + post("/:groupName/_edit", editGroupForm)(managersOnly { form => + defining(params("groupName"), form.memberNames.map(_.split(",").map { + _.split(":") match { + case Array(userName, isManager) => (userName, isManager.toBoolean) + } + }.toList).getOrElse(Nil)){ case (groupName, members) => getAccountByUserName(groupName, true).map { account => updateGroup(groupName, form.url, form.isRemoved) @@ -230,11 +238,11 @@ trait CreateControllerBase extends AccountManagementControllerBase { } } else { // Update GROUP_MEMBER - updateGroupMembers(form.groupName, memberNames) + updateGroupMembers(form.groupName, members) // Update COLLABORATOR for group repositories getRepositoryNamesOfUser(form.groupName).foreach { repositoryName => removeCollaborators(form.groupName, repositoryName) - memberNames.foreach { userName => + members.foreach { case (userName, isManager) => addCollaborator(form.groupName, repositoryName, userName) } } diff --git a/src/main/scala/app/UserManagementController.scala b/src/main/scala/app/UserManagementController.scala index 50ffb3c34..dffc2e2cc 100644 --- a/src/main/scala/app/UserManagementController.scala +++ b/src/main/scala/app/UserManagementController.scala @@ -71,7 +71,7 @@ trait UserManagementControllerBase extends AccountManagementControllerBase { val users = getAllUsers(includeRemoved) val members = users.collect { case account if(account.isGroupAccount) => - account.userName -> getGroupMembers(account.userName) + account.userName -> getGroupMembers(account.userName).map(_._1) }.toMap admin.users.html.list(users, members, includeRemoved) }) @@ -127,7 +127,11 @@ trait UserManagementControllerBase extends AccountManagementControllerBase { post("/admin/users/_newgroup", newGroupForm)(adminOnly { form => createGroup(form.groupName, form.url) - updateGroupMembers(form.groupName, form.memberNames.map(_.split(",").toList).getOrElse(Nil)) + updateGroupMembers(form.groupName, form.memberNames.map(_.split(",").map { + _.split(":") match { + case Array(userName, isManager) => (userName, isManager.toBoolean) + } + }.toList).getOrElse(Nil)) updateImage(form.groupName, form.fileId, false) redirect("/admin/users") }) @@ -139,7 +143,11 @@ trait UserManagementControllerBase extends AccountManagementControllerBase { }) post("/admin/users/:groupName/_editgroup", editGroupForm)(adminOnly { form => - defining(params("groupName"), form.memberNames.map(_.split(",").toList).getOrElse(Nil)){ case (groupName, memberNames) => + defining(params("groupName"), form.memberNames.map(_.split(",").map { + _.split(":") match { + case Array(userName, isManager) => (userName, isManager.toBoolean) + } + }.toList).getOrElse(Nil)){ case (groupName, members) => getAccountByUserName(groupName, true).map { account => updateGroup(groupName, form.url, form.isRemoved) @@ -155,11 +163,11 @@ trait UserManagementControllerBase extends AccountManagementControllerBase { } } else { // Update GROUP_MEMBER - updateGroupMembers(form.groupName, memberNames) + updateGroupMembers(form.groupName, members) // Update COLLABORATOR for group repositories getRepositoryNamesOfUser(form.groupName).foreach { repositoryName => removeCollaborators(form.groupName, repositoryName) - memberNames.foreach { userName => + members.foreach { case (userName, isManager) => addCollaborator(form.groupName, repositoryName, userName) } } diff --git a/src/main/scala/model/GroupMembers.scala b/src/main/scala/model/GroupMembers.scala index 0bcd0af73..a2a38f350 100644 --- a/src/main/scala/model/GroupMembers.scala +++ b/src/main/scala/model/GroupMembers.scala @@ -5,10 +5,12 @@ import scala.slick.driver.H2Driver.simple._ object GroupMembers extends Table[GroupMember]("GROUP_MEMBER") { def groupName = column[String]("GROUP_NAME", O PrimaryKey) def userName = column[String]("USER_NAME", O PrimaryKey) - def * = groupName ~ userName <> (GroupMember, GroupMember.unapply _) + def isManager = column[Boolean]("MANAGER") + def * = groupName ~ userName ~ isManager <> (GroupMember, GroupMember.unapply _) } case class GroupMember( groupName: String, - userName: String + userName: String, + isManager: Boolean ) \ No newline at end of file diff --git a/src/main/scala/service/AccountService.scala b/src/main/scala/service/AccountService.scala index ff1186f65..2357f58b9 100644 --- a/src/main/scala/service/AccountService.scala +++ b/src/main/scala/service/AccountService.scala @@ -122,18 +122,18 @@ trait AccountService { def updateGroup(groupName: String, url: Option[String], removed: Boolean): Unit = Accounts.filter(_.userName is groupName.bind).map(t => t.url.? ~ t.removed).update(url, removed) - def updateGroupMembers(groupName: String, members: List[String]): Unit = { + def updateGroupMembers(groupName: String, members: List[(String, Boolean)]): Unit = { Query(GroupMembers).filter(_.groupName is groupName.bind).delete - members.foreach { userName => - GroupMembers insert GroupMember (groupName, userName) + members.foreach { case (userName, isManager) => + GroupMembers insert GroupMember (groupName, userName, isManager) } } - def getGroupMembers(groupName: String): List[String] = + def getGroupMembers(groupName: String): List[(String, Boolean)] = Query(GroupMembers) .filter(_.groupName is groupName.bind) .sortBy(_.userName) - .map(_.userName) + .map(m => m.userName ~ m.isManager) .list def getGroupsByUserName(userName: String): List[String] = diff --git a/src/main/scala/servlet/AutoUpdateListener.scala b/src/main/scala/servlet/AutoUpdateListener.scala index bfa699208..830ca292c 100644 --- a/src/main/scala/servlet/AutoUpdateListener.scala +++ b/src/main/scala/servlet/AutoUpdateListener.scala @@ -50,6 +50,7 @@ object AutoUpdate { * The history of versions. A head of this sequence is the current BitBucket version. */ val versions = Seq( + Version(1, 12), Version(1, 11), Version(1, 10), Version(1, 9), diff --git a/src/main/scala/util/Authenticator.scala b/src/main/scala/util/Authenticator.scala index c43b0ec17..bfa2a40e0 100644 --- a/src/main/scala/util/Authenticator.scala +++ b/src/main/scala/util/Authenticator.scala @@ -157,17 +157,17 @@ trait ReadableUsersAuthenticator { self: ControllerBase with RepositoryService = } /** - * Allows only the group members. + * Allows only the group managers. */ -trait GroupMemberAuthenticator { self: ControllerBase with AccountService => - protected def membersOnly(action: => Any) = { authenticate(action) } - protected def membersOnly[T](action: T => Any) = (form: T) => { authenticate(action(form)) } +trait GroupManagerAuthenticator { self: ControllerBase with AccountService => + protected def managersOnly(action: => Any) = { authenticate(action) } + protected def managersOnly[T](action: T => Any) = (form: T) => { authenticate(action(form)) } private def authenticate(action: => Any) = { { defining(request.paths){ paths => context.loginAccount match { - case Some(x) if(getGroupMembers(paths(0)).contains(x.userName)) => action + case Some(x) if(getGroupMembers(paths(0)).exists { case (userName, isManager) => userName == x.userName && isManager }) => action case _ => Unauthorized() } } diff --git a/src/main/twirl/account/main.scala.html b/src/main/twirl/account/main.scala.html index 2cbe2577c..d5f0d1ff9 100644 --- a/src/main/twirl/account/main.scala.html +++ b/src/main/twirl/account/main.scala.html @@ -1,5 +1,5 @@ @(account: model.Account, groupNames: List[String], active: String, - isGroupMember: Boolean = false)(body: Html)(implicit context: app.Context) + isGroupManager: Boolean = false)(body: Html)(implicit context: app.Context) @import context._ @import view.helpers._ @html.main(account.userName){ @@ -42,7 +42,7 @@
    • } - @if(loginAccount.isDefined && account.isGroupAccount && isGroupMember){ + @if(loginAccount.isDefined && account.isGroupAccount && isGroupManager){
  • Edit Group diff --git a/src/main/twirl/account/members.scala.html b/src/main/twirl/account/members.scala.html index b69fc0af0..0e21d0102 100644 --- a/src/main/twirl/account/members.scala.html +++ b/src/main/twirl/account/members.scala.html @@ -1,7 +1,7 @@ -@(account: model.Account, members: List[String], isGroupMember: Boolean)(implicit context: app.Context) +@(account: model.Account, members: List[String], isGroupManager: Boolean)(implicit context: app.Context) @import context._ @import view.helpers._ -@main(account, Nil, "members", isGroupMember){ +@main(account, Nil, "members", isGroupManager){ @if(members.isEmpty){ No members } else { diff --git a/src/main/twirl/account/repositories.scala.html b/src/main/twirl/account/repositories.scala.html index 7772088ca..100c2b4f6 100644 --- a/src/main/twirl/account/repositories.scala.html +++ b/src/main/twirl/account/repositories.scala.html @@ -1,9 +1,9 @@ @(account: model.Account, groupNames: List[String], repositories: List[service.RepositoryService.RepositoryInfo], - isGroupMember: Boolean)(implicit context: app.Context) + isGroupManager: Boolean)(implicit context: app.Context) @import context._ @import view.helpers._ -@main(account, groupNames, "repositories", isGroupMember){ +@main(account, groupNames, "repositories", isGroupManager){ @if(repositories.isEmpty){ No repositories } else { diff --git a/src/main/twirl/admin/users/group.scala.html b/src/main/twirl/admin/users/group.scala.html index abf64cbe3..fe037ea23 100644 --- a/src/main/twirl/admin/users/group.scala.html +++ b/src/main/twirl/admin/users/group.scala.html @@ -1,4 +1,4 @@ -@(account: Option[model.Account], members: List[String])(implicit context: app.Context) +@(account: Option[model.Account], members: List[(String, Boolean)])(implicit context: app.Context) @import context._ @import view.helpers._ @html.main(if(account.isEmpty) "New Group" else "Update Group"){ @@ -35,7 +35,7 @@
    + @if(account.isDefined){ +
    + Delete Group +
    + } + @if(account.isDefined){ + Cancel + }
    @@ -118,6 +128,10 @@ $(function(){ updateMembers(); }); + $('#delete').click(function(){ + return confirm('Once you delete this group, there is no going back.\nAre you sure?'); + }); + function updateMembers(){ var members = $('#member-list li').map(function(i, e){ var userName = $(e).data('name'); From 9bd1f0a4927582c991ec97c48487278a1b54f96c Mon Sep 17 00:00:00 2001 From: takezoe Date: Tue, 4 Mar 2014 10:53:26 +0900 Subject: [PATCH 26/47] (refs #241)Remove unnecessary code --- src/main/twirl/group.scala.html | 8 -------- 1 file changed, 8 deletions(-) diff --git a/src/main/twirl/group.scala.html b/src/main/twirl/group.scala.html index 710f58d6e..0432a79c2 100644 --- a/src/main/twirl/group.scala.html +++ b/src/main/twirl/group.scala.html @@ -12,14 +12,6 @@ - @* - @if(account.isDefined){ - - } - *@
    From f11be44c02414b85dbd0485f6f225586dc99205e Mon Sep 17 00:00:00 2001 From: takezoe Date: Wed, 5 Mar 2014 04:18:45 +0900 Subject: [PATCH 27/47] (refs #330)Return NotFound if specified file does not exist --- .../app/RepositoryViewerController.scala | 61 ++++++++++--------- 1 file changed, 31 insertions(+), 30 deletions(-) diff --git a/src/main/scala/app/RepositoryViewerController.scala b/src/main/scala/app/RepositoryViewerController.scala index fcc81dfe6..3a2141f78 100644 --- a/src/main/scala/app/RepositoryViewerController.scala +++ b/src/main/scala/app/RepositoryViewerController.scala @@ -82,44 +82,45 @@ trait RepositoryViewerControllerBase extends ControllerBase { val revCommit = JGitUtil.getRevCommitFromId(git, git.getRepository.resolve(id)) @scala.annotation.tailrec - def getPathObjectId(path: String, walk: TreeWalk): ObjectId = walk.next match { - case true if(walk.getPathString == path) => walk.getObjectId(0) - case true => getPathObjectId(path, walk) + def getPathObjectId(path: String, walk: TreeWalk): Option[ObjectId] = walk.next match { + case true if(walk.getPathString == path) => Some(walk.getObjectId(0)) + case true => getPathObjectId(path, walk) + case false => None } - val objectId = using(new TreeWalk(git.getRepository)){ treeWalk => + using(new TreeWalk(git.getRepository)){ treeWalk => treeWalk.addTree(revCommit.getTree) treeWalk.setRecursive(true) getPathObjectId(path, treeWalk) - } - - if(raw){ - // Download - defining(JGitUtil.getContent(git, objectId, false).get){ bytes => - contentType = FileUtil.getContentType(path, bytes) - bytes - } - } else { - // Viewer - val large = FileUtil.isLarge(git.getRepository.getObjectDatabase.open(objectId).getSize) - val viewer = if(FileUtil.isImage(path)) "image" else if(large) "large" else "other" - val bytes = if(viewer == "other") JGitUtil.getContent(git, objectId, false) else None - - val content = if(viewer == "other"){ - if(bytes.isDefined && FileUtil.isText(bytes.get)){ - // text - JGitUtil.ContentInfo("text", bytes.map(StringUtil.convertFromByteArray)) - } else { - // binary - JGitUtil.ContentInfo("binary", None) + } map { objectId => + if(raw){ + // Download + defining(JGitUtil.getContent(git, objectId, false).get){ bytes => + contentType = FileUtil.getContentType(path, bytes) + bytes } } else { - // image or large - JGitUtil.ContentInfo(viewer, None) - } + // Viewer + val large = FileUtil.isLarge(git.getRepository.getObjectDatabase.open(objectId).getSize) + val viewer = if(FileUtil.isImage(path)) "image" else if(large) "large" else "other" + val bytes = if(viewer == "other") JGitUtil.getContent(git, objectId, false) else None - repo.html.blob(id, repository, path.split("/").toList, content, new JGitUtil.CommitInfo(revCommit)) - } + val content = if(viewer == "other"){ + if(bytes.isDefined && FileUtil.isText(bytes.get)){ + // text + JGitUtil.ContentInfo("text", bytes.map(StringUtil.convertFromByteArray)) + } else { + // binary + JGitUtil.ContentInfo("binary", None) + } + } else { + // image or large + JGitUtil.ContentInfo(viewer, None) + } + + repo.html.blob(id, repository, path.split("/").toList, content, new JGitUtil.CommitInfo(revCommit)) + } + } getOrElse NotFound } }) From aa5b9dbbbdd7dbc877a0d442bc1db348297c9549 Mon Sep 17 00:00:00 2001 From: takezoe Date: Wed, 5 Mar 2014 04:23:44 +0900 Subject: [PATCH 28/47] Remove unnecessary code --- src/main/scala/app/RepositoryViewerController.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/scala/app/RepositoryViewerController.scala b/src/main/scala/app/RepositoryViewerController.scala index 3a2141f78..6eb929656 100644 --- a/src/main/scala/app/RepositoryViewerController.scala +++ b/src/main/scala/app/RepositoryViewerController.scala @@ -267,7 +267,7 @@ trait RepositoryViewerControllerBase extends ControllerBase { repo.html.guide(repository) } else { using(Git.open(getRepositoryDir(repository.owner, repository.name))){ git => - val revisions = Seq(if(revstr.isEmpty) repository.repository.defaultBranch else revstr, repository.branchList.head) + //val revisions = Seq(if(revstr.isEmpty) repository.repository.defaultBranch else revstr, repository.branchList.head) // get specified commit JGitUtil.getDefaultBranch(git, repository, revstr).map { case (objectId, revision) => defining(JGitUtil.getRevCommitFromId(git, objectId)){ revCommit => From 6f9ef32d96d6de6cae9701a72ceb0ab2229fd26d Mon Sep 17 00:00:00 2001 From: shimamoto Date: Wed, 5 Mar 2014 14:35:49 +0900 Subject: [PATCH 29/47] (refs #292) Fix to limit issue result before joins issue labels. --- src/main/scala/service/IssuesService.scala | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/src/main/scala/service/IssuesService.scala b/src/main/scala/service/IssuesService.scala index b1215995f..e109dd46f 100644 --- a/src/main/scala/service/IssuesService.scala +++ b/src/main/scala/service/IssuesService.scala @@ -120,16 +120,10 @@ trait IssuesService { // get issues and comment count and labels searchIssueQuery(repos, condition, filterUser, onlyPullRequest) .innerJoin(IssueOutline).on { (t1, t2) => t1.byIssue(t2.userName, t2.repositoryName, t2.issueId) } - .leftJoin (IssueLabels) .on { case ((t1, t2), t3) => t1.byIssue(t3.userName, t3.repositoryName, t3.issueId) } - .leftJoin (Labels) .on { case (((t1, t2), t3), t4) => t3.byLabel(t4.userName, t4.repositoryName, t4.labelId) } - .map { case (((t1, t2), t3), t4) => - (t1, t2.commentCount, t4.labelId.?, t4.labelName.?, t4.color.?) - } - .sortBy(_._4) // labelName - .sortBy { case (t1, commentCount, _,_,_) => + .sortBy { case (t1, t2) => (condition.sort match { case "created" => t1.registeredDate - case "comments" => commentCount + case "comments" => t2.commentCount case "updated" => t1.updatedDate }) match { case sort => condition.direction match { @@ -139,6 +133,11 @@ trait IssuesService { } } .drop(offset).take(limit) + .leftJoin (IssueLabels) .on { case ((t1, t2), t3) => t1.byIssue(t3.userName, t3.repositoryName, t3.issueId) } + .leftJoin (Labels) .on { case (((t1, t2), t3), t4) => t3.byLabel(t4.userName, t4.repositoryName, t4.labelId) } + .map { case (((t1, t2), t3), t4) => + (t1, t2.commentCount, t4.labelId.?, t4.labelName.?, t4.color.?) + } .list .splitWith { (c1, c2) => c1._1.userName == c2._1.userName && From 145c155ba5cc37ce31697862edc390833acceb51 Mon Sep 17 00:00:00 2001 From: shimamoto Date: Wed, 5 Mar 2014 14:40:52 +0900 Subject: [PATCH 30/47] Remove unnecessary import. --- src/main/scala/service/IssuesService.scala | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/main/scala/service/IssuesService.scala b/src/main/scala/service/IssuesService.scala index e109dd46f..590e300bf 100644 --- a/src/main/scala/service/IssuesService.scala +++ b/src/main/scala/service/IssuesService.scala @@ -8,7 +8,6 @@ import Q.interpolation import model._ import util.Implicits._ import util.StringUtil._ -import util.StringUtil trait IssuesService { import IssuesService._ @@ -315,7 +314,7 @@ trait IssuesService { } def closeIssuesFromMessage(message: String, userName: String, owner: String, repository: String) = { - StringUtil.extractCloseId(message).foreach { issueId => + extractCloseId(message).foreach { issueId => for(issue <- getIssue(owner, repository, issueId) if !issue.closed){ createComment(owner, repository, userName, issue.issueId, "Close", "close") updateClosed(owner, repository, issue.issueId, true) From c7a2ec82909a2b87b6f7c659649a84f268a9c874 Mon Sep 17 00:00:00 2001 From: takezoe Date: Wed, 5 Mar 2014 16:23:27 +0900 Subject: [PATCH 31/47] (refs #299)Fix redirection path in PullRequestsController --- src/main/scala/app/PullRequestsController.scala | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/scala/app/PullRequestsController.scala b/src/main/scala/app/PullRequestsController.scala index bf3bea268..be47ee932 100644 --- a/src/main/scala/app/PullRequestsController.scala +++ b/src/main/scala/app/PullRequestsController.scala @@ -228,16 +228,16 @@ trait PullRequestsControllerBase extends ControllerBase { val oldBranch = JGitUtil.getDefaultBranch(oldGit, originRepository).get._2 val newBranch = JGitUtil.getDefaultBranch(newGit, forkedRepository).get._2 - redirect(s"${context.path}/${forkedRepository.owner}/${forkedRepository.name}/compare/${originUserName}:${oldBranch}...${newBranch}") + redirect(s"/${forkedRepository.owner}/${forkedRepository.name}/compare/${originUserName}:${oldBranch}...${newBranch}") } } getOrElse NotFound } case _ => { using(Git.open(getRepositoryDir(forkedRepository.owner, forkedRepository.name))){ git => JGitUtil.getDefaultBranch(git, forkedRepository).map { case (_, defaultBranch) => - redirect(s"${context.path}/${forkedRepository.owner}/${forkedRepository.name}/compare/${defaultBranch}...${defaultBranch}") + redirect(s"/${forkedRepository.owner}/${forkedRepository.name}/compare/${defaultBranch}...${defaultBranch}") } getOrElse { - redirect(s"${context.path}/${forkedRepository.owner}/${forkedRepository.name}") + redirect(s"/${forkedRepository.owner}/${forkedRepository.name}") } } } From d92a1cee1c01af2cea16fc21302878d3c849bcca Mon Sep 17 00:00:00 2001 From: takezoe Date: Wed, 5 Mar 2014 19:18:50 +0900 Subject: [PATCH 32/47] Replace Context#path with the base url if it's configured. --- src/main/scala/app/ControllerBase.scala | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/src/main/scala/app/ControllerBase.scala b/src/main/scala/app/ControllerBase.scala index 81e1dca83..2ae40648f 100644 --- a/src/main/scala/app/ControllerBase.scala +++ b/src/main/scala/app/ControllerBase.scala @@ -28,7 +28,7 @@ abstract class ControllerBase extends ScalatraFilter // Don't set content type via Accept header. override def format(implicit request: HttpServletRequest) = "" - override def doFilter(request: ServletRequest, response: ServletResponse, chain: FilterChain) { + override def doFilter(request: ServletRequest, response: ServletResponse, chain: FilterChain): Unit = try { val httpRequest = request.asInstanceOf[HttpServletRequest] val httpResponse = response.asInstanceOf[HttpServletResponse] val context = request.getServletContext.getContextPath @@ -56,12 +56,25 @@ abstract class ControllerBase extends ScalatraFilter // Scalatra actions super.doFilter(request, response, chain) } + } finally { + contextCache.remove(); } + private val contextCache = new java.lang.ThreadLocal[Context]() + /** * Returns the context object for the request. */ - implicit def context: Context = Context(servletContext.getContextPath, LoginAccount, request) + implicit def context: Context = { + contextCache.get match { + case null => { + val context = Context(loadSystemSettings().baseUrl.getOrElse(servletContext.getContextPath), LoginAccount, request) + contextCache.set(context) + context + } + case context => context + } + } private def LoginAccount: Option[Account] = session.getAs[Account](Keys.Session.LoginAccount) From b732e0d55a1b180aee8b0a3d060a34cc0367b2d2 Mon Sep 17 00:00:00 2001 From: takezoe Date: Wed, 5 Mar 2014 22:12:34 +0900 Subject: [PATCH 33/47] Fix error when base url is configured. --- src/main/scala/app/ControllerBase.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/scala/app/ControllerBase.scala b/src/main/scala/app/ControllerBase.scala index 2ae40648f..4168a8d3d 100644 --- a/src/main/scala/app/ControllerBase.scala +++ b/src/main/scala/app/ControllerBase.scala @@ -143,7 +143,7 @@ abstract class ControllerBase extends ScalatraFilter */ case class Context(path: String, loginAccount: Option[Account], request: HttpServletRequest){ - lazy val currentPath = request.getRequestURI.substring(path.length) + lazy val currentPath = request.getRequestURI.substring(request.getContextPath.length) /** * Get object from cache. From 9b15af3bb726f45150b5332bf116d5e8228e46b0 Mon Sep 17 00:00:00 2001 From: takezoe Date: Wed, 5 Mar 2014 22:15:22 +0900 Subject: [PATCH 34/47] Update README.md for 1.11.1 release --- README.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/README.md b/README.md index 43470be57..07314d893 100644 --- a/README.md +++ b/README.md @@ -58,6 +58,9 @@ Run the following commands in `Terminal` to Release Notes -------- +### 1.11.1 - 06 Mar 2014 +- Bug fix + ### 1.11 - 01 Mar 2014 - Base URL for redirection, notification and repository URL box is configurable - Remove ```--https``` option because it's possible to substitute in the base url From 716eddac7b1e9a9ab2882b3ed0aec88dac77281d Mon Sep 17 00:00:00 2001 From: takezoe Date: Thu, 6 Mar 2014 02:46:40 +0900 Subject: [PATCH 35/47] (refs #241)Checkbox for manager is replaced with toggle buttons --- src/main/twirl/group.scala.html | 32 +++++++++++++++----------------- 1 file changed, 15 insertions(+), 17 deletions(-) diff --git a/src/main/twirl/group.scala.html b/src/main/twirl/group.scala.html index 0432a79c2..de8d1c047 100644 --- a/src/main/twirl/group.scala.html +++ b/src/main/twirl/group.scala.html @@ -31,8 +31,11 @@
      @members.map { case (userName, isManager) =>
    • - - @userName +
      + + +
      + @userName (remove)
      • } @@ -62,6 +65,10 @@ } \ No newline at end of file From eff3a7acb48290792c08387ab93460e96d1ab25e Mon Sep 17 00:00:00 2001 From: takezoe Date: Thu, 6 Mar 2014 11:05:47 +0900 Subject: [PATCH 36/47] (refs #241)Fix group creation / edition form presentation --- src/main/twirl/group.scala.html | 52 ++++++++++++++++++--------------- 1 file changed, 29 insertions(+), 23 deletions(-) diff --git a/src/main/twirl/group.scala.html b/src/main/twirl/group.scala.html index de8d1c047..c6c542798 100644 --- a/src/main/twirl/group.scala.html +++ b/src/main/twirl/group.scala.html @@ -2,10 +2,10 @@ @import context._ @import view.helpers._ @main(if(account.isEmpty) "Create group" else "Edit group"){ -
      +
      -
      +
      @@ -25,20 +25,10 @@ @helper.html.uploadavatar(account)
      -
      +
        - @members.map { case (userName, isManager) => -
      • -
        - - -
        - @userName - (remove) -
        • - }
      @helper.html.account("memberName", 200) @@ -92,16 +82,7 @@ $(function(){ 'userName': userName }, function(data, status){ if(data == 'true'){ - // add member - $('#member-list').append($('
    • ') - .data('name', userName) - .append($('
      ') - .append($('').addClass('is_manager_' + userName)) - .append($('').addClass('is_manager_' + userName))) - .append(' ') - .append($('').attr('href', '@path/' + userName).text(userName)) - .append(' ') - .append($('').attr('href', '#').addClass('remove').text('(remove)'))); + addMemberHTML(userName, false); } else { $('#error-memberName').text('User does not exist.'); } @@ -121,6 +102,31 @@ $(function(){ return confirm('Once you delete this group, there is no going back.\nAre you sure?'); }); + @members.map { case (userName, isManager) => + addMemberHTML('@userName', @isManager); + } + + function addMemberHTML(userName, isManager){ + var memberButton = $('').addClass('is_manager_' + userName); + if(!isManager){ + memberButton.addClass('active'); + } + var managerButton = $('').addClass('is_manager_' + userName); + if(isManager){ + memberButton.addClass('active'); + } + + $('#member-list').append($('
    • ') + .data('name', userName) + .append($('
      ') + .append(memberButton) + .append(managerButton)) + .append(' ') + .append($('').attr('href', '@path/' + userName).text(userName)) + .append(' ') + .append($('(remove)'))); + } + function updateMembers(){ var members = $('#member-list li').map(function(i, e){ var userName = $(e).data('name'); From 50d84835cb2fc109b1debcbc82c9b1c6ca9f1e7c Mon Sep 17 00:00:00 2001 From: takezoe Date: Thu, 6 Mar 2014 11:24:28 +0900 Subject: [PATCH 37/47] Merge CreateController to AccountController --- src/main/scala/ScalatraBootstrap.scala | 1 - src/main/scala/app/AccountController.scala | 271 +++++++++++++++++++- src/main/scala/app/CreateController.scala | 285 --------------------- 3 files changed, 268 insertions(+), 289 deletions(-) delete mode 100644 src/main/scala/app/CreateController.scala diff --git a/src/main/scala/ScalatraBootstrap.scala b/src/main/scala/ScalatraBootstrap.scala index b03456578..21c213d49 100644 --- a/src/main/scala/ScalatraBootstrap.scala +++ b/src/main/scala/ScalatraBootstrap.scala @@ -20,7 +20,6 @@ class ScalatraBootstrap extends LifeCycle { context.mount(new DashboardController, "/*") context.mount(new UserManagementController, "/*") context.mount(new SystemSettingsController, "/*") - context.mount(new CreateController, "/*") context.mount(new AccountController, "/*") context.mount(new RepositoryViewerController, "/*") context.mount(new WikiController, "/*") diff --git a/src/main/scala/app/AccountController.scala b/src/main/scala/app/AccountController.scala index e1c293f77..7ee24aa30 100644 --- a/src/main/scala/app/AccountController.scala +++ b/src/main/scala/app/AccountController.scala @@ -1,17 +1,24 @@ package app import service._ -import util.{FileUtil, OneselfAuthenticator} +import util._ import util.StringUtil._ import util.Directory._ +import util.ControlUtil._ import jp.sf.amateras.scalatra.forms._ import org.apache.commons.io.FileUtils +import org.scalatra.i18n.Messages +import org.eclipse.jgit.api.Git +import org.eclipse.jgit.lib.{FileMode, Constants} +import org.eclipse.jgit.dircache.DirCache class AccountController extends AccountControllerBase - with AccountService with RepositoryService with ActivityService with OneselfAuthenticator + with AccountService with RepositoryService with ActivityService with WikiService with LabelsService + with OneselfAuthenticator with UsersAuthenticator with GroupManagerAuthenticator with ReadableUsersAuthenticator trait AccountControllerBase extends AccountManagementControllerBase { - self: AccountService with RepositoryService with ActivityService with OneselfAuthenticator => + self: AccountService with RepositoryService with ActivityService with WikiService with LabelsService + with OneselfAuthenticator with UsersAuthenticator with GroupManagerAuthenticator with ReadableUsersAuthenticator => case class AccountNewForm(userName: String, password: String, fullName: String, mailAddress: String, url: Option[String], fileId: Option[String]) @@ -37,6 +44,40 @@ trait AccountControllerBase extends AccountManagementControllerBase { "clearImage" -> trim(label("Clear image" , boolean())) )(AccountEditForm.apply) + case class NewGroupForm(groupName: String, url: Option[String], fileId: Option[String], members: String) + case class EditGroupForm(groupName: String, url: Option[String], fileId: Option[String], members: String, clearImage: Boolean) + + val newGroupForm = mapping( + "groupName" -> trim(label("Group name" ,text(required, maxlength(100), identifier, uniqueUserName))), + "url" -> trim(label("URL" ,optional(text(maxlength(200))))), + "fileId" -> trim(label("File ID" ,optional(text()))), + "members" -> trim(label("Members" ,text(required, members))) + )(NewGroupForm.apply) + + val editGroupForm = mapping( + "groupName" -> trim(label("Group name" ,text(required, maxlength(100), identifier))), + "url" -> trim(label("URL" ,optional(text(maxlength(200))))), + "fileId" -> trim(label("File ID" ,optional(text()))), + "members" -> trim(label("Members" ,text(required, members))), + "clearImage" -> trim(label("Clear image" ,boolean())) + )(EditGroupForm.apply) + + case class RepositoryCreationForm(owner: String, name: String, description: Option[String], isPrivate: Boolean, createReadme: Boolean) + case class ForkRepositoryForm(owner: String, name: String) + + val newRepositoryForm = mapping( + "owner" -> trim(label("Owner" , text(required, maxlength(40), identifier, existsAccount))), + "name" -> trim(label("Repository name", text(required, maxlength(40), identifier, uniqueRepository))), + "description" -> trim(label("Description" , optional(text()))), + "isPrivate" -> trim(label("Repository Type", boolean())), + "createReadme" -> trim(label("Create README" , boolean())) + )(RepositoryCreationForm.apply) + + val forkRepositoryForm = mapping( + "owner" -> trim(label("Repository owner", text(required))), + "name" -> trim(label("Repository name", text(required))) + )(ForkRepositoryForm.apply) + /** * Displays user information. */ @@ -140,4 +181,228 @@ trait AccountControllerBase extends AccountManagementControllerBase { } else NotFound } + get("/groups/new")(usersOnly { + html.group(None, List((context.loginAccount.get.userName, true))) + }) + + post("/groups/new", newGroupForm)(usersOnly { form => + createGroup(form.groupName, form.url) + updateGroupMembers(form.groupName, form.members.split(",").map { + _.split(":") match { + case Array(userName, isManager) => (userName, isManager.toBoolean) + } + }.toList) + updateImage(form.groupName, form.fileId, false) + redirect(s"/${form.groupName}") + }) + + get("/:groupName/_editgroup")(managersOnly { + defining(params("groupName")){ groupName => + html.group(getAccountByUserName(groupName, true), getGroupMembers(groupName)) + } + }) + + get("/:groupName/_deletegroup")(managersOnly { + defining(params("groupName")){ groupName => + // Remove from GROUP_MEMBER + updateGroupMembers(groupName, Nil) + // Remove repositories + getRepositoryNamesOfUser(groupName).foreach { repositoryName => + deleteRepository(groupName, repositoryName) + FileUtils.deleteDirectory(getRepositoryDir(groupName, repositoryName)) + FileUtils.deleteDirectory(getWikiRepositoryDir(groupName, repositoryName)) + FileUtils.deleteDirectory(getTemporaryDir(groupName, repositoryName)) + } + } + redirect("/") + }) + + post("/:groupName/_editgroup", editGroupForm)(managersOnly { form => + defining(params("groupName"), form.members.split(",").map { + _.split(":") match { + case Array(userName, isManager) => (userName, isManager.toBoolean) + } + }.toList){ case (groupName, members) => + getAccountByUserName(groupName, true).map { account => + updateGroup(groupName, form.url, false) + + // Update GROUP_MEMBER + updateGroupMembers(form.groupName, members) + // Update COLLABORATOR for group repositories + getRepositoryNamesOfUser(form.groupName).foreach { repositoryName => + removeCollaborators(form.groupName, repositoryName) + members.foreach { case (userName, isManager) => + addCollaborator(form.groupName, repositoryName, userName) + } + } + + updateImage(form.groupName, form.fileId, form.clearImage) + redirect(s"/${form.groupName}") + + } getOrElse NotFound + } + }) + + /** + * Show the new repository form. + */ + get("/new")(usersOnly { + html.newrepo(getGroupsByUserName(context.loginAccount.get.userName)) + }) + + /** + * Create new repository. + */ + post("/new", newRepositoryForm)(usersOnly { form => + LockUtil.lock(s"${form.owner}/${form.name}/create"){ + if(getRepository(form.owner, form.name, baseUrl).isEmpty){ + val ownerAccount = getAccountByUserName(form.owner).get + val loginAccount = context.loginAccount.get + val loginUserName = loginAccount.userName + + // Insert to the database at first + createRepository(form.name, form.owner, form.description, form.isPrivate) + + // Add collaborators for group repository + if(ownerAccount.isGroupAccount){ + getGroupMembers(form.owner).foreach { case (userName, isManager) => + addCollaborator(form.owner, form.name, userName) + } + } + + // Insert default labels + insertDefaultLabels(form.owner, form.name) + + // Create the actual repository + val gitdir = getRepositoryDir(form.owner, form.name) + JGitUtil.initRepository(gitdir) + + if(form.createReadme){ + using(Git.open(gitdir)){ git => + val builder = DirCache.newInCore.builder() + val inserter = git.getRepository.newObjectInserter() + val headId = git.getRepository.resolve(Constants.HEAD + "^{commit}") + val content = if(form.description.nonEmpty){ + form.name + "\n" + + "===============\n" + + "\n" + + form.description.get + } else { + form.name + "\n" + + "===============\n" + } + + builder.add(JGitUtil.createDirCacheEntry("README.md", FileMode.REGULAR_FILE, + inserter.insert(Constants.OBJ_BLOB, content.getBytes("UTF-8")))) + builder.finish() + + JGitUtil.createNewCommit(git, inserter, headId, builder.getDirCache.writeTree(inserter), + loginAccount.fullName, loginAccount.mailAddress, "Initial commit") + } + } + + // Create Wiki repository + createWikiRepository(loginAccount, form.owner, form.name) + + // Record activity + recordCreateRepositoryActivity(form.owner, form.name, loginUserName) + } + + // redirect to the repository + redirect(s"/${form.owner}/${form.name}") + } + }) + + get("/:owner/:repository/fork")(readableUsersOnly { repository => + val loginAccount = context.loginAccount.get + val loginUserName = loginAccount.userName + + LockUtil.lock(s"${loginUserName}/${repository.name}/create"){ + if(repository.owner == loginUserName){ + // redirect to the repository + redirect(s"/${repository.owner}/${repository.name}") + } else { + getForkedRepositories(repository.owner, repository.name).find(_._1 == loginUserName).map { case (owner, name) => + // redirect to the repository + redirect(s"/${owner}/${name}") + } getOrElse { + // Insert to the database at first + val originUserName = repository.repository.originUserName.getOrElse(repository.owner) + val originRepositoryName = repository.repository.originRepositoryName.getOrElse(repository.name) + + createRepository( + repositoryName = repository.name, + userName = loginUserName, + description = repository.repository.description, + isPrivate = repository.repository.isPrivate, + originRepositoryName = Some(originRepositoryName), + originUserName = Some(originUserName), + parentRepositoryName = Some(repository.name), + parentUserName = Some(repository.owner) + ) + + // Insert default labels + insertDefaultLabels(loginUserName, repository.name) + + // clone repository actually + JGitUtil.cloneRepository( + getRepositoryDir(repository.owner, repository.name), + getRepositoryDir(loginUserName, repository.name)) + + // Create Wiki repository + JGitUtil.cloneRepository( + getWikiRepositoryDir(repository.owner, repository.name), + getWikiRepositoryDir(loginUserName, repository.name)) + + // insert commit id + using(Git.open(getRepositoryDir(loginUserName, repository.name))){ git => + JGitUtil.getRepositoryInfo(loginUserName, repository.name, baseUrl).branchList.foreach { branch => + JGitUtil.getCommitLog(git, branch) match { + case Right((commits, _)) => commits.foreach { commit => + if(!existsCommitId(loginUserName, repository.name, commit.id)){ + insertCommitId(loginUserName, repository.name, commit.id) + } + } + case Left(_) => ??? + } + } + } + + // Record activity + recordForkActivity(repository.owner, repository.name, loginUserName) + // redirect to the repository + redirect(s"/${loginUserName}/${repository.name}") + } + } + } + }) + + private def insertDefaultLabels(userName: String, repositoryName: String): Unit = { + createLabel(userName, repositoryName, "bug", "fc2929") + createLabel(userName, repositoryName, "duplicate", "cccccc") + createLabel(userName, repositoryName, "enhancement", "84b6eb") + createLabel(userName, repositoryName, "invalid", "e6e6e6") + createLabel(userName, repositoryName, "question", "cc317c") + createLabel(userName, repositoryName, "wontfix", "ffffff") + } + + private def existsAccount: Constraint = new Constraint(){ + override def validate(name: String, value: String, messages: Messages): Option[String] = + if(getAccountByUserName(value).isEmpty) Some("User or group does not exist.") else None + } + + private def uniqueRepository: Constraint = new Constraint(){ + override def validate(name: String, value: String, params: Map[String, String], messages: Messages): Option[String] = + params.get("owner").flatMap { userName => + getRepositoryNamesOfUser(userName).find(_ == value).map(_ => "Repository already exists.") + } + } + + private def members: Constraint = new Constraint(){ + override def validate(name: String, value: String, messages: Messages): Option[String] = { + if(value.split(",").exists { + _.split(":") match { case Array(userName, isManager) => isManager.toBoolean } + }) None else Some("Must select one manager at least.") + } + } } diff --git a/src/main/scala/app/CreateController.scala b/src/main/scala/app/CreateController.scala deleted file mode 100644 index 1c295c9c5..000000000 --- a/src/main/scala/app/CreateController.scala +++ /dev/null @@ -1,285 +0,0 @@ -package app - -import util.Directory._ -import util.ControlUtil._ -import util._ -import service._ -import org.eclipse.jgit.api.Git -import jp.sf.amateras.scalatra.forms._ -import org.eclipse.jgit.lib.{FileMode, Constants} -import org.eclipse.jgit.dircache.DirCache -import org.scalatra.i18n.Messages -import org.apache.commons.io.FileUtils - -class CreateController extends CreateControllerBase - with RepositoryService with AccountService with WikiService with LabelsService with ActivityService - with UsersAuthenticator with ReadableUsersAuthenticator with GroupManagerAuthenticator - -/** - * Creates new repository or group. - */ -trait CreateControllerBase extends AccountManagementControllerBase { - self: RepositoryService with AccountService with WikiService with LabelsService with ActivityService - with UsersAuthenticator with ReadableUsersAuthenticator with GroupManagerAuthenticator => - - case class RepositoryCreationForm(owner: String, name: String, description: Option[String], isPrivate: Boolean, createReadme: Boolean) - case class ForkRepositoryForm(owner: String, name: String) - - val newRepositoryForm = mapping( - "owner" -> trim(label("Owner" , text(required, maxlength(40), identifier, existsAccount))), - "name" -> trim(label("Repository name", text(required, maxlength(40), identifier, uniqueRepository))), - "description" -> trim(label("Description" , optional(text()))), - "isPrivate" -> trim(label("Repository Type", boolean())), - "createReadme" -> trim(label("Create README" , boolean())) - )(RepositoryCreationForm.apply) - - val forkRepositoryForm = mapping( - "owner" -> trim(label("Repository owner", text(required))), - "name" -> trim(label("Repository name", text(required))) - )(ForkRepositoryForm.apply) - - case class NewGroupForm(groupName: String, url: Option[String], fileId: Option[String], members: String) - case class EditGroupForm(groupName: String, url: Option[String], fileId: Option[String], members: String, clearImage: Boolean) - - val newGroupForm = mapping( - "groupName" -> trim(label("Group name" ,text(required, maxlength(100), identifier, uniqueUserName))), - "url" -> trim(label("URL" ,optional(text(maxlength(200))))), - "fileId" -> trim(label("File ID" ,optional(text()))), - "members" -> trim(label("Members" ,text(required, members))) - )(NewGroupForm.apply) - - val editGroupForm = mapping( - "groupName" -> trim(label("Group name" ,text(required, maxlength(100), identifier))), - "url" -> trim(label("URL" ,optional(text(maxlength(200))))), - "fileId" -> trim(label("File ID" ,optional(text()))), - "members" -> trim(label("Members" ,text(required, members))), - "clearImage" -> trim(label("Clear image" ,boolean())) - )(EditGroupForm.apply) - - /** - * Show the new repository form. - */ - get("/new")(usersOnly { - html.newrepo(getGroupsByUserName(context.loginAccount.get.userName)) - }) - - /** - * Create new repository. - */ - post("/new", newRepositoryForm)(usersOnly { form => - LockUtil.lock(s"${form.owner}/${form.name}/create"){ - if(getRepository(form.owner, form.name, baseUrl).isEmpty){ - val ownerAccount = getAccountByUserName(form.owner).get - val loginAccount = context.loginAccount.get - val loginUserName = loginAccount.userName - - // Insert to the database at first - createRepository(form.name, form.owner, form.description, form.isPrivate) - - // Add collaborators for group repository - if(ownerAccount.isGroupAccount){ - getGroupMembers(form.owner).foreach { case (userName, isManager) => - addCollaborator(form.owner, form.name, userName) - } - } - - // Insert default labels - insertDefaultLabels(form.owner, form.name) - - // Create the actual repository - val gitdir = getRepositoryDir(form.owner, form.name) - JGitUtil.initRepository(gitdir) - - if(form.createReadme){ - using(Git.open(gitdir)){ git => - val builder = DirCache.newInCore.builder() - val inserter = git.getRepository.newObjectInserter() - val headId = git.getRepository.resolve(Constants.HEAD + "^{commit}") - val content = if(form.description.nonEmpty){ - form.name + "\n" + - "===============\n" + - "\n" + - form.description.get - } else { - form.name + "\n" + - "===============\n" - } - - builder.add(JGitUtil.createDirCacheEntry("README.md", FileMode.REGULAR_FILE, - inserter.insert(Constants.OBJ_BLOB, content.getBytes("UTF-8")))) - builder.finish() - - JGitUtil.createNewCommit(git, inserter, headId, builder.getDirCache.writeTree(inserter), - loginAccount.fullName, loginAccount.mailAddress, "Initial commit") - } - } - - // Create Wiki repository - createWikiRepository(loginAccount, form.owner, form.name) - - // Record activity - recordCreateRepositoryActivity(form.owner, form.name, loginUserName) - } - - // redirect to the repository - redirect(s"/${form.owner}/${form.name}") - } - }) - - get("/:owner/:repository/fork")(readableUsersOnly { repository => - val loginAccount = context.loginAccount.get - val loginUserName = loginAccount.userName - - LockUtil.lock(s"${loginUserName}/${repository.name}/create"){ - if(repository.owner == loginUserName){ - // redirect to the repository - redirect(s"/${repository.owner}/${repository.name}") - } else { - getForkedRepositories(repository.owner, repository.name).find(_._1 == loginUserName).map { case (owner, name) => - // redirect to the repository - redirect(s"/${owner}/${name}") - } getOrElse { - // Insert to the database at first - val originUserName = repository.repository.originUserName.getOrElse(repository.owner) - val originRepositoryName = repository.repository.originRepositoryName.getOrElse(repository.name) - - createRepository( - repositoryName = repository.name, - userName = loginUserName, - description = repository.repository.description, - isPrivate = repository.repository.isPrivate, - originRepositoryName = Some(originRepositoryName), - originUserName = Some(originUserName), - parentRepositoryName = Some(repository.name), - parentUserName = Some(repository.owner) - ) - - // Insert default labels - insertDefaultLabels(loginUserName, repository.name) - - // clone repository actually - JGitUtil.cloneRepository( - getRepositoryDir(repository.owner, repository.name), - getRepositoryDir(loginUserName, repository.name)) - - // Create Wiki repository - JGitUtil.cloneRepository( - getWikiRepositoryDir(repository.owner, repository.name), - getWikiRepositoryDir(loginUserName, repository.name)) - - // insert commit id - using(Git.open(getRepositoryDir(loginUserName, repository.name))){ git => - JGitUtil.getRepositoryInfo(loginUserName, repository.name, baseUrl).branchList.foreach { branch => - JGitUtil.getCommitLog(git, branch) match { - case Right((commits, _)) => commits.foreach { commit => - if(!existsCommitId(loginUserName, repository.name, commit.id)){ - insertCommitId(loginUserName, repository.name, commit.id) - } - } - case Left(_) => ??? - } - } - } - - // Record activity - recordForkActivity(repository.owner, repository.name, loginUserName) - // redirect to the repository - redirect(s"/${loginUserName}/${repository.name}") - } - } - } - }) - - get("/groups/new")(usersOnly { - html.group(None, List((context.loginAccount.get.userName, true))) - }) - - post("/groups/new", newGroupForm)(usersOnly { form => - createGroup(form.groupName, form.url) - updateGroupMembers(form.groupName, form.members.split(",").map { - _.split(":") match { - case Array(userName, isManager) => (userName, isManager.toBoolean) - } - }.toList) - updateImage(form.groupName, form.fileId, false) - redirect(s"/${form.groupName}") - }) - - get("/:groupName/_editgroup")(managersOnly { - defining(params("groupName")){ groupName => - html.group(getAccountByUserName(groupName, true), getGroupMembers(groupName)) - } - }) - - get("/:groupName/_deletegroup")(managersOnly { - defining(params("groupName")){ groupName => - // Remove from GROUP_MEMBER - updateGroupMembers(groupName, Nil) - // Remove repositories - getRepositoryNamesOfUser(groupName).foreach { repositoryName => - deleteRepository(groupName, repositoryName) - FileUtils.deleteDirectory(getRepositoryDir(groupName, repositoryName)) - FileUtils.deleteDirectory(getWikiRepositoryDir(groupName, repositoryName)) - FileUtils.deleteDirectory(getTemporaryDir(groupName, repositoryName)) - } - } - redirect("/") - }) - - post("/:groupName/_editgroup", editGroupForm)(managersOnly { form => - defining(params("groupName"), form.members.split(",").map { - _.split(":") match { - case Array(userName, isManager) => (userName, isManager.toBoolean) - } - }.toList){ case (groupName, members) => - getAccountByUserName(groupName, true).map { account => - updateGroup(groupName, form.url, false) - - // Update GROUP_MEMBER - updateGroupMembers(form.groupName, members) - // Update COLLABORATOR for group repositories - getRepositoryNamesOfUser(form.groupName).foreach { repositoryName => - removeCollaborators(form.groupName, repositoryName) - members.foreach { case (userName, isManager) => - addCollaborator(form.groupName, repositoryName, userName) - } - } - - updateImage(form.groupName, form.fileId, form.clearImage) - redirect(s"/${form.groupName}") - - } getOrElse NotFound - } - }) - - private def insertDefaultLabels(userName: String, repositoryName: String): Unit = { - createLabel(userName, repositoryName, "bug", "fc2929") - createLabel(userName, repositoryName, "duplicate", "cccccc") - createLabel(userName, repositoryName, "enhancement", "84b6eb") - createLabel(userName, repositoryName, "invalid", "e6e6e6") - createLabel(userName, repositoryName, "question", "cc317c") - createLabel(userName, repositoryName, "wontfix", "ffffff") - } - - private def existsAccount: Constraint = new Constraint(){ - override def validate(name: String, value: String, messages: Messages): Option[String] = - if(getAccountByUserName(value).isEmpty) Some("User or group does not exist.") else None - } - - private def uniqueRepository: Constraint = new Constraint(){ - override def validate(name: String, value: String, params: Map[String, String], messages: Messages): Option[String] = - params.get("owner").flatMap { userName => - getRepositoryNamesOfUser(userName).find(_ == value).map(_ => "Repository already exists.") - } - } - - private def members: Constraint = new Constraint(){ - override def validate(name: String, value: String, messages: Messages): Option[String] = { - if(value.split(",").exists { - _.split(":") match { case Array(userName, isManager) => isManager.toBoolean } - }) None else Some("Must select one manager at least.") - } - } - - -} From c0f5cb164126098eab32b65f089842612175958f Mon Sep 17 00:00:00 2001 From: takezoe Date: Thu, 6 Mar 2014 11:26:58 +0900 Subject: [PATCH 38/47] Move group.scala.html to account package --- src/main/scala/app/AccountController.scala | 4 ++-- src/main/twirl/{ => account}/group.scala.html | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) rename src/main/twirl/{ => account}/group.scala.html (98%) diff --git a/src/main/scala/app/AccountController.scala b/src/main/scala/app/AccountController.scala index 7ee24aa30..4cd9785c1 100644 --- a/src/main/scala/app/AccountController.scala +++ b/src/main/scala/app/AccountController.scala @@ -182,7 +182,7 @@ trait AccountControllerBase extends AccountManagementControllerBase { } 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 => @@ -198,7 +198,7 @@ trait AccountControllerBase extends AccountManagementControllerBase { get("/:groupName/_editgroup")(managersOnly { defining(params("groupName")){ groupName => - html.group(getAccountByUserName(groupName, true), getGroupMembers(groupName)) + account.html.group(getAccountByUserName(groupName, true), getGroupMembers(groupName)) } }) diff --git a/src/main/twirl/group.scala.html b/src/main/twirl/account/group.scala.html similarity index 98% rename from src/main/twirl/group.scala.html rename to src/main/twirl/account/group.scala.html index c6c542798..b4b46dd12 100644 --- a/src/main/twirl/group.scala.html +++ b/src/main/twirl/account/group.scala.html @@ -1,7 +1,7 @@ @(account: Option[model.Account], members: List[(String, Boolean)])(implicit context: app.Context) @import context._ @import view.helpers._ -@main(if(account.isEmpty) "Create group" else "Edit group"){ +@html.main(if(account.isEmpty) "Create group" else "Edit group"){
      From 07d63ae63a07fc73fdfac2b1c3369635c823fca5 Mon Sep 17 00:00:00 2001 From: takezoe Date: Thu, 6 Mar 2014 11:39:13 +0900 Subject: [PATCH 39/47] Add caret to new icon --- src/main/twirl/main.scala.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/twirl/main.scala.html b/src/main/twirl/main.scala.html index 9115e5b90..51ba07b3b 100644 --- a/src/main/twirl/main.scala.html +++ b/src/main/twirl/main.scala.html @@ -54,7 +54,7 @@ } @if(loginAccount.isDefined){ @avatar(loginAccount.get.userName, 20) @loginAccount.get.userName - +
      • New repository
      • New group
        • From ff8b4b4a88bcf26e9011d8610276c0801a382c4a Mon Sep 17 00:00:00 2001 From: takezoe Date: Thu, 6 Mar 2014 11:39:41 +0900 Subject: [PATCH 40/47] Move newrepo.scala.html to account package --- src/main/scala/app/AccountController.scala | 2 +- src/main/twirl/{ => account}/newrepo.scala.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) rename src/main/twirl/{ => account}/newrepo.scala.html (98%) diff --git a/src/main/scala/app/AccountController.scala b/src/main/scala/app/AccountController.scala index 4cd9785c1..f89cb7424 100644 --- a/src/main/scala/app/AccountController.scala +++ b/src/main/scala/app/AccountController.scala @@ -247,7 +247,7 @@ trait AccountControllerBase extends AccountManagementControllerBase { * Show the new repository form. */ get("/new")(usersOnly { - html.newrepo(getGroupsByUserName(context.loginAccount.get.userName)) + account.html.newrepo(getGroupsByUserName(context.loginAccount.get.userName)) }) /** diff --git a/src/main/twirl/newrepo.scala.html b/src/main/twirl/account/newrepo.scala.html similarity index 98% rename from src/main/twirl/newrepo.scala.html rename to src/main/twirl/account/newrepo.scala.html index 05fefbc4d..b5f6c6aa0 100644 --- a/src/main/twirl/newrepo.scala.html +++ b/src/main/twirl/account/newrepo.scala.html @@ -1,7 +1,7 @@ @(groupNames: List[String])(implicit context: app.Context) @import context._ @import view.helpers._ -@main("Create a New Repository"){ +@html.main("Create a New Repository"){
        From c89f04b926507297a16ad3f1295f7e65a17eb2cd Mon Sep 17 00:00:00 2001 From: takezoe Date: Thu, 6 Mar 2014 12:17:25 +0900 Subject: [PATCH 41/47] (refs #241)Fix group editing in the administration console --- .../scala/app/UserManagementController.scala | 41 +++++++----- src/main/twirl/account/group.scala.html | 3 +- src/main/twirl/admin/users/group.scala.html | 63 ++++++++++--------- 3 files changed, 59 insertions(+), 48 deletions(-) diff --git a/src/main/scala/app/UserManagementController.scala b/src/main/scala/app/UserManagementController.scala index dffc2e2cc..37d5e0631 100644 --- a/src/main/scala/app/UserManagementController.scala +++ b/src/main/scala/app/UserManagementController.scala @@ -5,6 +5,7 @@ import util.AdminAuthenticator import util.StringUtil._ import util.ControlUtil._ import jp.sf.amateras.scalatra.forms._ +import org.scalatra.i18n.Messages import org.apache.commons.io.FileUtils import util.Directory._ @@ -23,10 +24,10 @@ trait UserManagementControllerBase extends AccountManagementControllerBase { fileId: Option[String], clearImage: Boolean, isRemoved: Boolean) case class NewGroupForm(groupName: String, url: Option[String], fileId: Option[String], - memberNames: Option[String]) + members: String) case class EditGroupForm(groupName: String, url: Option[String], fileId: Option[String], - memberNames: Option[String], clearImage: Boolean, isRemoved: Boolean) + members: String, clearImage: Boolean, isRemoved: Boolean) val newUserForm = mapping( "userName" -> trim(label("Username" ,text(required, maxlength(100), identifier, uniqueUserName))), @@ -51,19 +52,19 @@ trait UserManagementControllerBase extends AccountManagementControllerBase { )(EditUserForm.apply) val newGroupForm = mapping( - "groupName" -> trim(label("Group name" ,text(required, maxlength(100), identifier, uniqueUserName))), - "url" -> trim(label("URL" ,optional(text(maxlength(200))))), - "fileId" -> trim(label("File ID" ,optional(text()))), - "memberNames" -> trim(label("Member Names" ,optional(text()))) + "groupName" -> trim(label("Group name" ,text(required, maxlength(100), identifier, uniqueUserName))), + "url" -> trim(label("URL" ,optional(text(maxlength(200))))), + "fileId" -> trim(label("File ID" ,optional(text()))), + "members" -> trim(label("Members" ,text(required, members))) )(NewGroupForm.apply) val editGroupForm = mapping( - "groupName" -> trim(label("Group name" ,text(required, maxlength(100), identifier))), - "url" -> trim(label("URL" ,optional(text(maxlength(200))))), - "fileId" -> trim(label("File ID" ,optional(text()))), - "memberNames" -> trim(label("Member Names" ,optional(text()))), - "clearImage" -> trim(label("Clear image" ,boolean())), - "removed" -> trim(label("Disable" ,boolean())) + "groupName" -> trim(label("Group name" ,text(required, maxlength(100), identifier))), + "url" -> trim(label("URL" ,optional(text(maxlength(200))))), + "fileId" -> trim(label("File ID" ,optional(text()))), + "members" -> trim(label("Members" ,text(required, members))), + "clearImage" -> trim(label("Clear image" ,boolean())), + "removed" -> trim(label("Disable" ,boolean())) )(EditGroupForm.apply) get("/admin/users")(adminOnly { @@ -127,11 +128,11 @@ trait UserManagementControllerBase extends AccountManagementControllerBase { post("/admin/users/_newgroup", newGroupForm)(adminOnly { form => createGroup(form.groupName, form.url) - updateGroupMembers(form.groupName, form.memberNames.map(_.split(",").map { + updateGroupMembers(form.groupName, form.members.split(",").map { _.split(":") match { case Array(userName, isManager) => (userName, isManager.toBoolean) } - }.toList).getOrElse(Nil)) + }.toList) updateImage(form.groupName, form.fileId, false) redirect("/admin/users") }) @@ -143,11 +144,11 @@ trait UserManagementControllerBase extends AccountManagementControllerBase { }) post("/admin/users/:groupName/_editgroup", editGroupForm)(adminOnly { form => - defining(params("groupName"), form.memberNames.map(_.split(",").map { + defining(params("groupName"), form.members.split(",").map { _.split(":") match { case Array(userName, isManager) => (userName, isManager.toBoolean) } - }.toList).getOrElse(Nil)){ case (groupName, members) => + }.toList){ case (groupName, members) => getAccountByUserName(groupName, true).map { account => updateGroup(groupName, form.url, form.isRemoved) @@ -184,4 +185,12 @@ trait UserManagementControllerBase extends AccountManagementControllerBase { getAccountByUserName(params("userName")).isDefined }) + private def members: Constraint = new Constraint(){ + override def validate(name: String, value: String, messages: Messages): Option[String] = { + if(value.split(",").exists { + _.split(":") match { case Array(userName, isManager) => isManager.toBoolean } + }) None else Some("Must select one manager at least.") + } + } + } diff --git a/src/main/twirl/account/group.scala.html b/src/main/twirl/account/group.scala.html index b4b46dd12..de23a6a4f 100644 --- a/src/main/twirl/account/group.scala.html +++ b/src/main/twirl/account/group.scala.html @@ -113,7 +113,7 @@ $(function(){ } var managerButton = $('').addClass('is_manager_' + userName); if(isManager){ - memberButton.addClass('active'); + managerButton.addClass('active'); } $('#member-list').append($('
      • ') @@ -133,7 +133,6 @@ $(function(){ return userName + ':' + $('.is_manager_' + userName + '.active').attr('value'); }).get().join(','); $('#members').val(members); - return true; } }); \ No newline at end of file diff --git a/src/main/twirl/admin/users/group.scala.html b/src/main/twirl/admin/users/group.scala.html index 2ad79ad49..2f75cd01c 100644 --- a/src/main/twirl/admin/users/group.scala.html +++ b/src/main/twirl/admin/users/group.scala.html @@ -5,7 +5,7 @@ @admin.html.menu("users"){
        -
        +
        @@ -24,24 +24,17 @@
        - +
        @helper.html.uploadavatar(account)
        -
        +
        @helper.html.account("memberName", 200) @@ -61,6 +54,10 @@ }