Merge pull request #1100 from oohira/fix/label-duplicate-error

Fork: 0

johnpearcey / gitbucket_jkp

Browse code Merge pull request #1100 from oohira/fix/label-duplicate-error Fix bug that label duplicate check is wrong master
commit 7f184e1126c35b449631fd265c90b073c987a98f 2 parents 7f5024a + 09aafbc Naoki Takezoe authored on 9 Feb 2016

Patch

Unified Split

Showing 1 changed file

                Ignore Space
               Show notes
              View
            
          
          2 ■■■■■
          src/main/scala/gitbucket/core/model/BasicTemplate.scala
     def byLabel(userName: Column[String], repositoryName: Column[String], labelId: Column[Int]) =
      byRepository(userName, repositoryName) && (this.labelId === labelId)
 
    def byLabel(owner: String, repository: String, labelName: String) =
      byRepository(userName, repositoryName) && (this.labelName === labelName.bind)
      byRepository(owner, repository) && (this.labelName === labelName.bind)
  }
 
  trait MilestoneTemplate extends BasicTemplate { self: Table[_] =>
    val milestoneId = column[Int]("MILESTONE_ID")
     def byLabel(userName: Column[String], repositoryName: Column[String], labelId: Column[Int]) =
       byRepository(userName, repositoryName) && (this.labelId === labelId)
     def byLabel(owner: String, repository: String, labelName: String) =
+      byRepository(userName, repositoryName) && (this.labelName === labelName.bind)
+      byRepository(owner, repository) && (this.labelName === labelName.bind)
   }
   trait MilestoneTemplate extends BasicTemplate { self: Table[_] =>
     val milestoneId = column[Int]("MILESTONE_ID")

Show line notes below