Allow cross-repository dependencies on issues

models/issue.go

@@ -1748,8 +1748,8 @@ func GetRepoIssueStats(repoID, uid int64, filterMode int, isPull bool) (numOpen
 }
 
 // SearchIssueIDsByKeyword search issues on database
-func SearchIssueIDsByKeyword(kw string, repoID int64, limit, start int) (int64, []int64, error) {
-	var repoCond = builder.Eq{"repo_id": repoID}
+func SearchIssueIDsByKeyword(kw string, repoIDs []int64, limit, start int) (int64, []int64, error) {
+	var repoCond = builder.In("repo_id", repoIDs)
 	var subQuery = builder.Select("id").From("issue").Where(repoCond)
 	var cond = builder.And(
 		repoCond,
@@ -1821,33 +1821,69 @@ func UpdateIssueDeadline(issue *Issue, deadlineUnix timeutil.TimeStamp, doer *Us
 	return sess.Commit()
 }
 
+// DependencyInfo represents high level information about an issue which is a dependency of another issue.
+type DependencyInfo struct {
+	ID       int64  `xorm:"id"`
+	RepoID   int64  `xorm:"repo_id"`
+	Index    int64  `xorm:"index"`
+	IsClosed bool   `xorm:"is_closed"`
+	Title    string `xorm:"name"`
+	RepoLink string `xorm:"-"`
+}
+
 // Get Blocked By Dependencies, aka all issues this issue is blocked by.
-func (issue *Issue) getBlockedByDependencies(e Engine) (issueDeps []*Issue, err error) {
-	return issueDeps, e.
-		Table("issue_dependency").
+func (issue *Issue) getBlockedByDependencies(e Engine) (issueDeps []*DependencyInfo, err error) {
+	err = e.Table("issue_dependency").
 		Select("issue.*").
 		Join("INNER", "issue", "issue.id = issue_dependency.dependency_id").
 		Where("issue_id = ?", issue.ID).
 		Find(&issueDeps)
+
+	if err != nil {
+		return nil, err
+	}
+
+	for i := 0; i < len(issueDeps); i++ {
+		repo, err := GetRepositoryByID(issueDeps[i].RepoID)
+		if err != nil {
+			return nil, err
+		}
+		issueDeps[i].RepoLink = repo.Link()
+	}
+
+	return issueDeps, nil
 }
 
 // Get Blocking Dependencies, aka all issues this issue blocks.
-func (issue *Issue) getBlockingDependencies(e Engine) (issueDeps []*Issue, err error) {
-	return issueDeps, e.
-		Table("issue_dependency").
+func (issue *Issue) getBlockingDependencies(e Engine) (issueDeps []*DependencyInfo, err error) {
+	err = e.Table("issue_dependency").
 		Select("issue.*").
 		Join("INNER", "issue", "issue.id = issue_dependency.issue_id").
 		Where("dependency_id = ?", issue.ID).
 		Find(&issueDeps)
+
+	if err != nil {
+		return nil, err
+	}
+
+	for i := 0; i < len(issueDeps); i++ {
+		repo, err := GetRepositoryByID(issueDeps[i].RepoID)
+		if err != nil {
+			return nil, err
+		}
+		issueDeps[i].RepoLink = repo.Link()
+	}
+
+	return issueDeps, nil
 }
 
 // BlockedByDependencies finds all Dependencies an issue is blocked by
-func (issue *Issue) BlockedByDependencies() ([]*Issue, error) {
+func (issue *Issue) BlockedByDependencies() ([]*DependencyInfo, error) {
 	return issue.getBlockedByDependencies(x)
 }
 
 // BlockingDependencies returns all blocking dependencies, aka all other issues a given issue blocks
-func (issue *Issue) BlockingDependencies() ([]*Issue, error) {
+func (issue *Issue) BlockingDependencies() ([]*DependencyInfo, error) {
 	return issue.getBlockingDependencies(x)
 }
 

models/issue_label.go

@@ -217,6 +217,19 @@ func GetLabelIDsInRepoByNames(repoID int64, labelNames []string) ([]int64, error
 		Find(&labelIDs)
 }
 
+// GetLabelIDsInReposByNames returns a list of labelIDs by names in one of the given
+// repositories.
+// it silently ignores label names that do not belong to the repository.
+func GetLabelIDsInReposByNames(repoIDs []int64, labelNames []string) ([]int64, error) {
+	labelIDs := make([]int64, 0, len(labelNames))
+	return labelIDs, x.Table("label").
+		In("repo_id", repoIDs).
+		In("name", labelNames).
+		Asc("name").
+		Cols("id").
+		Find(&labelIDs)
+}
+
 // GetLabelInRepoByID returns a label by ID in given repository.
 func GetLabelInRepoByID(repoID, labelID int64) (*Label, error) {
 	return getLabelInRepoByID(x, repoID, labelID)

models/issue_test.go

@@ -298,24 +298,23 @@ func TestIssue_loadTotalTimes(t *testing.T) {
 
 func TestIssue_SearchIssueIDsByKeyword(t *testing.T) {
 	assert.NoError(t, PrepareTestDatabase())
-
-	total, ids, err := SearchIssueIDsByKeyword("issue2", 1, 10, 0)
+	total, ids, err := SearchIssueIDsByKeyword("issue2", []int64{1}, 10, 0)
 	assert.NoError(t, err)
 	assert.EqualValues(t, 1, total)
 	assert.EqualValues(t, []int64{2}, ids)
 
-	total, ids, err = SearchIssueIDsByKeyword("first", 1, 10, 0)
+	total, ids, err = SearchIssueIDsByKeyword("first", []int64{1}, 10, 0)
 	assert.NoError(t, err)
 	assert.EqualValues(t, 1, total)
 	assert.EqualValues(t, []int64{1}, ids)
 
-	total, ids, err = SearchIssueIDsByKeyword("for", 1, 10, 0)
+	total, ids, err = SearchIssueIDsByKeyword("for", []int64{1}, 10, 0)
 	assert.NoError(t, err)
 	assert.EqualValues(t, 4, total)
 	assert.EqualValues(t, []int64{1, 2, 3, 5}, ids)
 
 	// issue1's comment id 2
-	total, ids, err = SearchIssueIDsByKeyword("good", 1, 10, 0)
+	total, ids, err = SearchIssueIDsByKeyword("good", []int64{1}, 10, 0)
 	assert.NoError(t, err)
 	assert.EqualValues(t, 1, total)
 	assert.EqualValues(t, []int64{1}, ids)

modules/indexer/issues/bleve.go

@@ -218,9 +218,18 @@ func (b *BleveIndexer) Delete(ids ...int64) error {
 
 // Search searches for issues by given conditions.
 // Returns the matching issue IDs
-func (b *BleveIndexer) Search(keyword string, repoID int64, limit, start int) (*SearchResult, error) {
+func (b *BleveIndexer) Search(keyword string, repoIDs []int64, limit, start int) (*SearchResult, error) {
+	var repoQueriesP []*query.NumericRangeQuery
+	for _, repoID := range repoIDs {
+		repoQueriesP = append(repoQueriesP, numericEqualityQuery(repoID, "RepoID"))
+	}
+	repoQueries := make([]query.Query, len(repoQueriesP))
+	for i, v := range repoQueriesP {
+		repoQueries[i] = query.Query(v)
+	}
+
 	indexerQuery := bleve.NewConjunctionQuery(
-		numericEqualityQuery(repoID, "RepoID"),
+		bleve.NewDisjunctionQuery(repoQueries...),
 		bleve.NewDisjunctionQuery(
 			newMatchPhraseQuery(keyword, "Title", issueIndexerAnalyzer),
 			newMatchPhraseQuery(keyword, "Content", issueIndexerAnalyzer),
@@ -242,8 +251,7 @@ func (b *BleveIndexer) Search(keyword string, repoID int64, limit, start int) (*
 			return nil, err
 		}
 		ret.Hits = append(ret.Hits, Match{
-			ID:     id,
-			RepoID: repoID,
+			ID: id,
 		})
 	}
 	return &ret, nil

modules/indexer/issues/bleve_test.go

@@ -76,7 +76,7 @@ func TestBleveIndexAndSearch(t *testing.T) {
 	)
 
 	for _, kw := range keywords {
-		res, err := indexer.Search(kw.Keyword, 2, 10, 0)
+		res, err := indexer.Search(kw.Keyword, []int64{2}, 10, 0)
 		assert.NoError(t, err)
 
 		var ids = make([]int64, 0, len(res.Hits))

modules/indexer/issues/db.go

@@ -26,8 +26,8 @@ func (db *DBIndexer) Delete(ids ...int64) error {
 }
 
 // Search dummy function
-func (db *DBIndexer) Search(kw string, repoID int64, limit, start int) (*SearchResult, error) {
-	total, ids, err := models.SearchIssueIDsByKeyword(kw, repoID, limit, start)
+func (db *DBIndexer) Search(kw string, repoIDs []int64, limit, start int) (*SearchResult, error) {
+	total, ids, err := models.SearchIssueIDsByKeyword(kw, repoIDs, limit, start)
 	if err != nil {
 		return nil, err
 	}
@@ -37,8 +37,7 @@ func (db *DBIndexer) Search(kw string, repoID int64, limit, start int) (*SearchR
 	}
 	for _, id := range ids {
 		result.Hits = append(result.Hits, Match{
-			ID:     id,
-			RepoID: repoID,
+			ID: id,
 		})
 	}
 	return &result, nil

modules/indexer/issues/indexer.go

@@ -26,9 +26,8 @@ type IndexerData struct {
 
 // Match represents on search result
 type Match struct {
-	ID     int64   `json:"id"`
-	RepoID int64   `json:"repo_id"`
-	Score  float64 `json:"score"`
+	ID    int64   `json:"id"`
+	Score float64 `json:"score"`
 }
 
 // SearchResult represents search results
@@ -42,7 +41,7 @@ type Indexer interface {
 	Init() (bool, error)
 	Index(issue []*IndexerData) error
 	Delete(ids ...int64) error
-	Search(kw string, repoID int64, limit, start int) (*SearchResult, error)
+	Search(kw string, repoIDs []int64, limit, start int) (*SearchResult, error)
 }
 
 var (
@@ -195,9 +194,9 @@ func DeleteRepoIssueIndexer(repo *models.Repository) {
 }
 
 // SearchIssuesByKeyword search issue ids by keywords and repo id
-func SearchIssuesByKeyword(repoID int64, keyword string) ([]int64, error) {
+func SearchIssuesByKeyword(repoIDs []int64, keyword string) ([]int64, error) {
 	var issueIDs []int64
-	res, err := issueIndexer.Search(keyword, repoID, 1000, 0)
+	res, err := issueIndexer.Search(keyword, repoIDs, 1000, 0)
 	if err != nil {
 		return nil, err
 	}

modules/indexer/issues/indexer_test.go

@@ -38,19 +38,19 @@ func TestBleveSearchIssues(t *testing.T) {
 
 	time.Sleep(5 * time.Second)
 
-	ids, err := SearchIssuesByKeyword(1, "issue2")
+	ids, err := SearchIssuesByKeyword([]int64{1}, "issue2")
 	assert.NoError(t, err)
 	assert.EqualValues(t, []int64{2}, ids)
 
-	ids, err = SearchIssuesByKeyword(1, "first")
+	ids, err = SearchIssuesByKeyword([]int64{1}, "first")
 	assert.NoError(t, err)
 	assert.EqualValues(t, []int64{1}, ids)
 
-	ids, err = SearchIssuesByKeyword(1, "for")
+	ids, err = SearchIssuesByKeyword([]int64{1}, "for")
 	assert.NoError(t, err)
 	assert.EqualValues(t, []int64{1, 2, 3, 5}, ids)
 
-	ids, err = SearchIssuesByKeyword(1, "good")
+	ids, err = SearchIssuesByKeyword([]int64{1}, "good")
 	assert.NoError(t, err)
 	assert.EqualValues(t, []int64{1}, ids)
 }
@@ -63,19 +63,19 @@ func TestDBSearchIssues(t *testing.T) {
 		fatalTestError("Error InitIssueIndexer: %v\n", err)
 	}
 
-	ids, err := SearchIssuesByKeyword(1, "issue2")
+	ids, err := SearchIssuesByKeyword([]int64{1}, "issue2")
 	assert.NoError(t, err)
 	assert.EqualValues(t, []int64{2}, ids)
 
-	ids, err = SearchIssuesByKeyword(1, "first")
+	ids, err = SearchIssuesByKeyword([]int64{1}, "first")
 	assert.NoError(t, err)
 	assert.EqualValues(t, []int64{1}, ids)
 
-	ids, err = SearchIssuesByKeyword(1, "for")
+	ids, err = SearchIssuesByKeyword([]int64{1}, "for")
 	assert.NoError(t, err)
 	assert.EqualValues(t, []int64{1, 2, 3, 5}, ids)
 
-	ids, err = SearchIssuesByKeyword(1, "good")
+	ids, err = SearchIssuesByKeyword([]int64{1}, "good")
 	assert.NoError(t, err)
 	assert.EqualValues(t, []int64{1}, ids)
 }

options/locale/locale_cs-CZ.ini

@@ -908,7 +908,6 @@ issues.dependency.add_error_dep_issue_not_exist=Související úkol neexistuje.
 issues.dependency.add_error_dep_not_exist=Závislost neexistuje.
 issues.dependency.add_error_dep_exists=Závislost již existuje.
 issues.dependency.add_error_cannot_create_circular=Nemůžete vytvořit závislost dvou úkolů, které se vzájemně blokují.
-issues.dependency.add_error_dep_not_same_repo=Oba úkoly musí být ve stejném repozitáři.
 issues.review.self.approval=Nemůžete schválit svůj požadavek na natažení.
 issues.review.self.rejection=Nemůžete požadovat změny ve svém vlastním požadavku na natažení.
 issues.review.approve=schválil tyto změny %s

options/locale/locale_de-DE.ini

@@ -931,7 +931,6 @@ issues.dependency.add_error_dep_issue_not_exist=Abhängiges Issue existiert nich
 issues.dependency.add_error_dep_not_exist=Abhängigkeit existiert nicht.
 issues.dependency.add_error_dep_exists=Abhängigkeit existiert bereits.
 issues.dependency.add_error_cannot_create_circular=Du kannst keine Abhängigkeit erstellen, bei welcher sich zwei Issues gegenseitig blockieren.
-issues.dependency.add_error_dep_not_same_repo=Beide Issues müssen sich im selben Repository befinden.
 issues.review.self.approval=Du kannst keine Änderungen an deinem eigenen Pull-Request genehmigen.
 issues.review.self.rejection=Du kannst keine Änderungen an deinem eigenen Pull-Request anfragen.
 issues.review.approve=hat die Änderungen %s genehmigt

options/locale/locale_en-US.ini

@@ -933,7 +933,6 @@ issues.dependency.add_error_dep_issue_not_exist = Dependent issue does not exist
 issues.dependency.add_error_dep_not_exist = Dependency does not exist.
 issues.dependency.add_error_dep_exists = Dependency already exists.
 issues.dependency.add_error_cannot_create_circular = You cannot create a dependency with two issues blocking each other.
-issues.dependency.add_error_dep_not_same_repo = Both issues must be in the same repository.
 issues.review.self.approval = You cannot approve your own pull request.
 issues.review.self.rejection = You cannot request changes on your own pull request.
 issues.review.approve = "approved these changes %s"

options/locale/locale_es-ES.ini

@@ -931,7 +931,6 @@ issues.dependency.add_error_dep_issue_not_exist=Incidencia dependiente no existe
 issues.dependency.add_error_dep_not_exist=La dependencia no existe.
 issues.dependency.add_error_dep_exists=La dependencia ya existe.
 issues.dependency.add_error_cannot_create_circular=No puede crear una depenciena con dos issues que se estan bloqueando mutuamente.
-issues.dependency.add_error_dep_not_same_repo=Ambas incidencias deben estar en el mismo repositorio.
 issues.review.self.approval=No puede aprobar su propio pull request.
 issues.review.self.rejection=No puede sugerir cambios en su propio pull request.
 issues.review.approve=aprobado estos cambios %s

options/locale/locale_fr-FR.ini

@@ -931,7 +931,6 @@ issues.dependency.add_error_dep_issue_not_exist=Le ticket dépendant n'existe pa
 issues.dependency.add_error_dep_not_exist=La dépendance n'existe pas.
 issues.dependency.add_error_dep_exists=La dépendance existe déjà.
 issues.dependency.add_error_cannot_create_circular=Vous ne pouvez pas créer une dépendance avec deux tickets qui se bloquent l'un l'autre.
-issues.dependency.add_error_dep_not_same_repo=Les deux tickets doivent être dans le même dépôt.
 issues.review.self.approval=Vous ne pouvez approuver vos propres demandes d'ajout.
 issues.review.self.rejection=Vous ne pouvez demander de changements sur vos propres demandes de changement.
 issues.review.approve=ces changements ont été approuvés %s

options/locale/locale_ja-JP.ini

@@ -931,7 +931,6 @@ issues.dependency.add_error_dep_issue_not_exist=依存先の課題が存在し
 issues.dependency.add_error_dep_not_exist=依存関係が存在していません。
 issues.dependency.add_error_dep_exists=依存関係は既に設定済みです。
 issues.dependency.add_error_cannot_create_circular=2つの課題が互いにブロックする依存関係は作成できません。
-issues.dependency.add_error_dep_not_same_repo=両方とも同じリポジトリの課題にする必要があります。
 issues.review.self.approval=自分のプルリクエストを承認することはできません。
 issues.review.self.rejection=自分のプルリクエストに対して修正を要求することはできません。
 issues.review.approve=が変更を承認 %s

options/locale/locale_lv-LV.ini

@@ -930,7 +930,6 @@ issues.dependency.add_error_dep_issue_not_exist=Atkarīgā problēma neeksistē.
 issues.dependency.add_error_dep_not_exist=Atkarība neeksistē.
 issues.dependency.add_error_dep_exists=Atkarība jau ir pievienota.
 issues.dependency.add_error_cannot_create_circular=Nav iespējams veidot atkarību, kur divas problēmas bloķētu viena otru.
-issues.dependency.add_error_dep_not_same_repo=Abām problēmām ir jābūt no viena repozitorija.
 issues.review.self.approval=Nevar apstiprināt savu izmaiņu pieprasījumi.
 issues.review.self.rejection=Nevar pieprasīt izmaiņas savam izmaiņu pieprasījumam.
 issues.review.approve=apstiprināja izmaiņas %s

options/locale/locale_pt-BR.ini

@@ -931,7 +931,6 @@ issues.dependency.add_error_dep_issue_not_exist=Issue dependente não existe.
 issues.dependency.add_error_dep_not_exist=Dependência não existe.
 issues.dependency.add_error_dep_exists=Dependência já existe.
 issues.dependency.add_error_cannot_create_circular=Você não pode criar uma dependência com duas issues bloqueando uma a outra.
-issues.dependency.add_error_dep_not_same_repo=Ambas as issues devem estar no mesmo repositório.
 issues.review.self.approval=Você não pode aprovar o seu próprio pull request.
 issues.review.self.rejection=Você não pode solicitar alterações em seu próprio pull request.
 issues.review.approve=aprovou estas alterações %s

options/locale/locale_ru-RU.ini

@@ -900,7 +900,6 @@ issues.dependency.add_error_dep_issue_not_exist=Зависимая задача
 issues.dependency.add_error_dep_not_exist=Зависимости не существует.
 issues.dependency.add_error_dep_exists=Зависимость уже существует.
 issues.dependency.add_error_cannot_create_circular=Вы не можете создать зависимость с двумя задачами, блокирующими друг друга.
-issues.dependency.add_error_dep_not_same_repo=Обе задачи должны находиться в одном репозитории.
 issues.review.self.approval=Вы не можете одобрить собственный Pull Request.
 issues.review.self.rejection=Невозможно запрашивать изменения своего Pull Request'а.
 issues.review.approve=одобрил(а) эти изменения %s

options/locale/locale_uk-UA.ini

@@ -802,7 +802,6 @@ issues.dependency.add_error_dep_issue_not_exist=Залежність для пр
 issues.dependency.add_error_dep_not_exist=Залежність не існує.
 issues.dependency.add_error_dep_exists=Залежність уже існує.
 issues.dependency.add_error_cannot_create_circular=Ви не можете створити залежність з двома проблемами, які блокують одна одну.
-issues.dependency.add_error_dep_not_same_repo=Обидві проблеми повинні бути в одному репозиторії.
 issues.review.self.approval=Ви не можете схвалити власний пулл-реквест.
 issues.review.self.rejection=Ви не можете надіслати запит на зміну на власний пулл-реквест.
 issues.review.approve=зміни затверджено %s

options/locale/locale_zh-CN.ini

@@ -931,7 +931,6 @@ issues.dependency.add_error_dep_issue_not_exist=依赖项不存在。
 issues.dependency.add_error_dep_not_exist=依赖项不存在。
 issues.dependency.add_error_dep_exists=依赖项已存在。
 issues.dependency.add_error_cannot_create_circular=您不能创建依赖, 使得两个工单相互阻止。
-issues.dependency.add_error_dep_not_same_repo=这两个工单必须在同一仓库。
 issues.review.self.approval=您不能批准您自己的合并请求。
 issues.review.self.rejection=您不能请求对您自己的合并请求进行更改。
 issues.review.approve=已于 %s 批准这些更改

public/js/index.js

@@ -3069,11 +3069,10 @@ function deleteDependencyModal(id, type) {
 }
 
 function initIssueList() {
-    const repolink = $('#repolink').val();
     $('#new-dependency-drop-list')
         .dropdown({
             apiSettings: {
-                url: suburl + '/api/v1/repos/' + repolink + '/issues?q={query}',
+                url: suburl + '/api/v1/repos/issues/search?q={query}',
                 onResponse: function(response) {
                     const filteredResponse = {'success': true, 'results': []};
                     const currIssueId = $('#new-dependency-drop-list').data('issue-id');

routers/api/v1/api.go

@@ -602,6 +602,8 @@ func RegisterRoutes(m *macaron.Macaron) {
 			m.Get("/search", repo.Search)
 		})
 
+		m.Get("/repos/issues/search", repo.SearchIssues)
+
 		m.Combo("/repositories/:id", reqToken()).Get(repo.GetByID)
 
 		m.Group("/repos", func() {