diff --git a/src/main/resources/update/gitbucket-core_4.14.xml b/src/main/resources/update/gitbucket-core_4.14.xml index a6e9d53..9f8a9a7 100644 --- a/src/main/resources/update/gitbucket-core_4.14.xml +++ b/src/main/resources/update/gitbucket-core_4.14.xml @@ -5,7 +5,7 @@ - + diff --git a/src/main/scala/gitbucket/core/controller/PrioritiesController.scala b/src/main/scala/gitbucket/core/controller/PrioritiesController.scala index a1e200a..3adae1a 100644 --- a/src/main/scala/gitbucket/core/controller/PrioritiesController.scala +++ b/src/main/scala/gitbucket/core/controller/PrioritiesController.scala @@ -20,7 +20,7 @@ val priorityForm = mapping( "priorityName" -> trim(label("Priority name", text(required, priorityName, uniquePriorityName, maxlength(100)))), - "description" -> trim(label("Description", text(required, maxlength(255)))), + "description" -> trim(label("Description", text(maxlength(255)))), "priorityColor" -> trim(label("Color", text(required, color))) )(PriorityForm.apply) diff --git a/src/main/scala/gitbucket/core/model/Priorities.scala b/src/main/scala/gitbucket/core/model/Priorities.scala index f625efd..eb31740 100644 --- a/src/main/scala/gitbucket/core/model/Priorities.scala +++ b/src/main/scala/gitbucket/core/model/Priorities.scala @@ -12,7 +12,7 @@ val ordering = column[Int]("ORDERING") val isDefault = column[Boolean]("IS_DEFAULT") val color = column[String]("COLOR") - def * = (userName, repositoryName, priorityId, priorityName, description, isDefault, ordering, color) <> (Priority.tupled, Priority.unapply) + def * = (userName, repositoryName, priorityId, priorityName, description.?, isDefault, ordering, color) <> (Priority.tupled, Priority.unapply) def byPrimaryKey(owner: String, repository: String, priorityId: Int) = byPriority(owner, repository, priorityId) def byPrimaryKey(userName: Rep[String], repositoryName: Rep[String], priorityId: Rep[Int]) = byPriority(userName, repositoryName, priorityId) @@ -24,7 +24,7 @@ repositoryName: String, priorityId: Int = 0, priorityName: String, - description: String, + description: Option[String], isDefault: Boolean, ordering: Int = 0, color: String){ diff --git a/src/main/scala/gitbucket/core/service/PrioritiesService.scala b/src/main/scala/gitbucket/core/service/PrioritiesService.scala index 7ab752d..f5a867d 100644 --- a/src/main/scala/gitbucket/core/service/PrioritiesService.scala +++ b/src/main/scala/gitbucket/core/service/PrioritiesService.scala @@ -3,6 +3,7 @@ import gitbucket.core.model.Priority import gitbucket.core.model.Profile._ import gitbucket.core.model.Profile.profile.blockingApi._ +import gitbucket.core.util.StringUtil trait PrioritiesService { @@ -29,7 +30,7 @@ userName = owner, repositoryName = repository, priorityName = priorityName, - description = description, + description = StringUtil.emptyToNone(description), isDefault = isDefault, ordering = ordering, color = color @@ -39,8 +40,8 @@ def updatePriority(owner: String, repository: String, priorityId: Int, priorityName: String, description: String, color: String) (implicit s: Session): Unit = Priorities.filter(_.byPrimaryKey(owner, repository, priorityId)) - .map(t => (t.priorityName, t.description, t.color)) - .update(priorityName, description, color) + .map(t => (t.priorityName, t.description.?, t.color)) + .update(priorityName, StringUtil.emptyToNone(description), color) def reorderPriorities(owner: String, repository: String, order: Map[Int, Int]) (implicit s: Session): Unit = { diff --git a/src/main/scala/gitbucket/core/util/StringUtil.scala b/src/main/scala/gitbucket/core/util/StringUtil.scala index d1eadf3..2b0bb6c 100644 --- a/src/main/scala/gitbucket/core/util/StringUtil.scala +++ b/src/main/scala/gitbucket/core/util/StringUtil.scala @@ -137,5 +137,5 @@ // b.toString // } - + def emptyToNone(str: String): Option[String] = Option(str).map(_.trim).flatMap(s => if (s.isEmpty) None else Some(s)); } diff --git a/src/main/twirl/gitbucket/core/issues/issueinfo.scala.html b/src/main/twirl/gitbucket/core/issues/issueinfo.scala.html index 012ad0a..4b0fb88 100644 --- a/src/main/twirl/gitbucket/core/issues/issueinfo.scala.html +++ b/src/main/twirl/gitbucket/core/issues/issueinfo.scala.html @@ -43,7 +43,7 @@
  • Clear priority
  • @priorities.map { priority =>
  • - + @gitbucket.core.helper.html.checkicon(issue.flatMap(_.priorityId).orElse(defaultPriority.map(_.priorityId)).map(id => id == priority.priorityId).getOrElse(false))   @priority.priorityName @@ -57,7 +57,7 @@ @issue.flatMap(_.priorityId).orElse(defaultPriority.map(_.priorityId)).map { priorityId => @priorities.collect { case priority if(priority.priorityId == priorityId) => - @priority.priorityName + @priority.priorityName } }.getOrElse { No priority diff --git a/src/main/twirl/gitbucket/core/issues/listparts.scala.html b/src/main/twirl/gitbucket/core/issues/listparts.scala.html index f083189..9ed5013 100644 --- a/src/main/twirl/gitbucket/core/issues/listparts.scala.html +++ b/src/main/twirl/gitbucket/core/issues/listparts.scala.html @@ -57,7 +57,7 @@
  • @priorities.map { priority =>
  • - + @gitbucket.core.helper.html.checkicon(condition.priority == Some(Some(priority.priorityName)))    @priority.priorityName @@ -157,7 +157,7 @@ @gitbucket.core.helper.html.dropdown("Priority", filter = ("priority", "Find Priority...")) {
  • No priority
  • @priorities.map { priority => -
  • +
  •   @priority.priorityName
  • } @@ -244,7 +244,7 @@
    #@issue.issueId opened @gitbucket.core.helper.html.datetimeago(issue.registeredDate) by @helpers.user(issue.openedUserName, styleClass="username") @priority.map(priority => priorities.filter(p => p.priorityName == priority).head).map { priority => - + @priority.priorityName } @milestone.map { milestone => diff --git a/src/main/twirl/gitbucket/core/issues/priorities/edit.scala.html b/src/main/twirl/gitbucket/core/issues/priorities/edit.scala.html index b3dd075..b8342ba 100644 --- a/src/main/twirl/gitbucket/core/issues/priorities/edit.scala.html +++ b/src/main/twirl/gitbucket/core/issues/priorities/edit.scala.html @@ -12,7 +12,7 @@ - + diff --git a/src/main/twirl/gitbucket/core/issues/priorities/priority.scala.html b/src/main/twirl/gitbucket/core/issues/priorities/priority.scala.html index 5884546..b9e1ad1 100644 --- a/src/main/twirl/gitbucket/core/issues/priorities/priority.scala.html +++ b/src/main/twirl/gitbucket/core/issues/priorities/priority.scala.html @@ -19,7 +19,7 @@
    - @priority.description + @priority.description.getOrElse("")