diff --git a/src/main/resources/update/gitbucket-core_4.2.xml b/src/main/resources/update/gitbucket-core_4.2.xml index f81e39d..b4ad19c 100644 --- a/src/main/resources/update/gitbucket-core_4.2.xml +++ b/src/main/resources/update/gitbucket-core_4.2.xml @@ -1,9 +1,9 @@ - - + + diff --git a/src/main/scala/gitbucket/core/model/Repository.scala b/src/main/scala/gitbucket/core/model/Repository.scala index 4012b8b..f4e8138 100644 --- a/src/main/scala/gitbucket/core/model/Repository.scala +++ b/src/main/scala/gitbucket/core/model/Repository.scala @@ -17,11 +17,11 @@ val originRepositoryName = column[String]("ORIGIN_REPOSITORY_NAME") val parentUserName = column[String]("PARENT_USER_NAME") val parentRepositoryName = column[String]("PARENT_REPOSITORY_NAME") - val enableWiki = column[Boolean]("ENABLE_WIKI") val enableIssues = column[Boolean]("ENABLE_ISSUES") - val externalWikiUrl = column[String]("EXTERNAL_WIKI_URL") + val enableWiki = column[Boolean]("ENABLE_WIKI") val externalIssuesUrl = column[String]("EXTERNAL_ISSUES_URL") - def * = (userName, repositoryName, isPrivate, description.?, defaultBranch, registeredDate, updatedDate, lastActivityDate, originUserName.?, originRepositoryName.?, parentUserName.?, parentRepositoryName.?, enableWiki, enableIssues, externalWikiUrl.?, externalIssuesUrl.?) <> (Repository.tupled, Repository.unapply) + val externalWikiUrl = column[String]("EXTERNAL_WIKI_URL") + def * = (userName, repositoryName, isPrivate, description.?, defaultBranch, registeredDate, updatedDate, lastActivityDate, originUserName.?, originRepositoryName.?, parentUserName.?, parentRepositoryName.?, enableIssues, enableWiki, externalIssuesUrl.?, externalWikiUrl.?) <> (Repository.tupled, Repository.unapply) def byPrimaryKey(owner: String, repository: String) = byRepository(owner, repository) } @@ -40,8 +40,8 @@ originRepositoryName: Option[String], parentUserName: Option[String], parentRepositoryName: Option[String], - enableWiki: Boolean, enableIssues: Boolean, - externalWikiUrl: Option[String], - externalIssuesUrl: Option[String] + enableWiki: Boolean, + externalIssuesUrl: Option[String], + externalWikiUrl: Option[String] ) diff --git a/src/main/scala/gitbucket/core/service/RepositoryService.scala b/src/main/scala/gitbucket/core/service/RepositoryService.scala index 7050436..15dce71 100644 --- a/src/main/scala/gitbucket/core/service/RepositoryService.scala +++ b/src/main/scala/gitbucket/core/service/RepositoryService.scala @@ -37,10 +37,10 @@ originRepositoryName = originRepositoryName, parentUserName = parentUserName, parentRepositoryName = parentRepositoryName, - enableWiki = true, enableIssues = true, - externalWikiUrl = None, - externalIssuesUrl = None + enableWiki = true, + externalIssuesUrl = None, + externalWikiUrl = None ) IssueId insert (userName, repositoryName, 0) @@ -318,8 +318,8 @@ * Save repository options. */ def saveRepositoryOptions(userName: String, repositoryName: String, - description: Option[String], isPrivate: Boolean, enableIssues: Boolean, - enableWiki: Boolean, externalIssuesUrl: Option[String], externalWikiUrl: Option[String])(implicit s: Session): Unit = + description: Option[String], isPrivate: Boolean, + enableIssues: Boolean, enableWiki: Boolean, externalIssuesUrl: Option[String], externalWikiUrl: Option[String])(implicit s: Session): Unit = Repositories.filter(_.byRepository(userName, repositoryName)) .map { r => (r.description.?, r.isPrivate, r.enableIssues, r.enableWiki, r.externalIssuesUrl.?, r.externalWikiUrl.?, r.updatedDate) } .update (description, isPrivate, enableIssues, enableWiki, externalIssuesUrl, externalWikiUrl, currentDate)