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

Change order of columns

Browse Source
This commit is contained in:
Naoki Takezoe
2016-06-12 08:23:57 +09:00
parent 860ccce89b
commit 1094e8ca2d
3 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/resources/update/gitbucket-core_4.2.xml
View File

@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<changeSet> <changeSet>
<addColumn tableName="REPOSITORY"> <addColumn tableName="REPOSITORY">
<column name="ENABLE_WIKI" type="boolean" nullable="false" defaultValueBoolean="true"/>
<column name="ENABLE_ISSUES" type="boolean" nullable="false" defaultValueBoolean="true"/> <column name="ENABLE_ISSUES" type="boolean" nullable="false" defaultValueBoolean="true"/>
<column name="EXTERNAL_WIKI_URL" type="varchar(200)" nullable="true"/> <column name="ENABLE_WIKI" type="boolean" nullable="false" defaultValueBoolean="true"/>
<column name="EXTERNAL_ISSUES_URL" type="varchar(200)" nullable="true"/> <column name="EXTERNAL_ISSUES_URL" type="varchar(200)" nullable="true"/>
<column name="EXTERNAL_WIKI_URL" type="varchar(200)" nullable="true"/>
</addColumn> </addColumn>
</changeSet> </changeSet>

12
src/main/scala/gitbucket/core/model/Repository.scala
View File

@@ -17,11 +17,11 @@ trait RepositoryComponent extends TemplateComponent { self: Profile =>
val originRepositoryName = column[String]("ORIGIN_REPOSITORY_NAME") val originRepositoryName = column[String]("ORIGIN_REPOSITORY_NAME")
val parentUserName = column[String]("PARENT_USER_NAME") val parentUserName = column[String]("PARENT_USER_NAME")
val parentRepositoryName = column[String]("PARENT_REPOSITORY_NAME") val parentRepositoryName = column[String]("PARENT_REPOSITORY_NAME")
val enableWiki = column[Boolean]("ENABLE_WIKI")
val enableIssues = column[Boolean]("ENABLE_ISSUES") 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") 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) def byPrimaryKey(owner: String, repository: String) = byRepository(owner, repository)
} }
@@ -40,8 +40,8 @@ case class Repository(
originRepositoryName: Option[String], originRepositoryName: Option[String],
parentUserName: Option[String], parentUserName: Option[String],
parentRepositoryName: Option[String], parentRepositoryName: Option[String],
enableWiki: Boolean,
enableIssues: Boolean, enableIssues: Boolean,
externalWikiUrl: Option[String], enableWiki: Boolean,
externalIssuesUrl: Option[String] externalIssuesUrl: Option[String],
externalWikiUrl: Option[String]
) )

10
src/main/scala/gitbucket/core/service/RepositoryService.scala
View File

@@ -37,10 +37,10 @@ trait RepositoryService { self: AccountService =>
originRepositoryName = originRepositoryName, originRepositoryName = originRepositoryName,
parentUserName = parentUserName, parentUserName = parentUserName,
parentRepositoryName = parentRepositoryName, parentRepositoryName = parentRepositoryName,
enableWiki = true,
enableIssues = true, enableIssues = true,
externalWikiUrl = None, enableWiki = true,
externalIssuesUrl = None externalIssuesUrl = None,
externalWikiUrl = None
) )
IssueId insert (userName, repositoryName, 0) IssueId insert (userName, repositoryName, 0)
@@ -318,8 +318,8 @@ trait RepositoryService { self: AccountService =>
* Save repository options. * Save repository options.
*/ */
def saveRepositoryOptions(userName: String, repositoryName: String, def saveRepositoryOptions(userName: String, repositoryName: String,
description: Option[String], isPrivate: Boolean, enableIssues: Boolean, description: Option[String], isPrivate: Boolean,
enableWiki: Boolean, externalIssuesUrl: Option[String], externalWikiUrl: Option[String])(implicit s: Session): Unit = enableIssues: Boolean, enableWiki: Boolean, externalIssuesUrl: Option[String], externalWikiUrl: Option[String])(implicit s: Session): Unit =
Repositories.filter(_.byRepository(userName, repositoryName)) Repositories.filter(_.byRepository(userName, repositoryName))
.map { r => (r.description.?, r.isPrivate, r.enableIssues, r.enableWiki, r.externalIssuesUrl.?, r.externalWikiUrl.?, r.updatedDate) } .map { r => (r.description.?, r.isPrivate, r.enableIssues, r.enableWiki, r.externalIssuesUrl.?, r.externalWikiUrl.?, r.updatedDate) }
.update (description, isPrivate, enableIssues, enableWiki, externalIssuesUrl, externalWikiUrl, currentDate) .update (description, isPrivate, enableIssues, enableWiki, externalIssuesUrl, externalWikiUrl, currentDate)