taiga
/
taiga-front
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fixing epic links in rich content

stable
Alejandro Alonso 2016-09-21 13:46:25 +02:00 committed by David Barragán Merino
parent 2c6db751aa
commit 0023f528a9
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/coffee/modules/common/wisiwyg.coffee
View File

@ -374,7 +374,7 @@ MarkitupDirective = ($rootscope, $rs, $selectedText, $template, $compile, $trans
search: (term, callback) -> search: (term, callback) ->
term = taiga.slugify(term) term = taiga.slugify(term)
searchTypes = ['issues', 'tasks', 'userstories'] searchTypes = ['issues', 'tasks', 'userstories', 'epics']
searchProps = ['ref', 'subject'] searchProps = ['ref', 'subject']
filter = (item) => filter = (item) =>
@ -384,8 +384,7 @@ MarkitupDirective = ($rootscope, $rs, $selectedText, $template, $compile, $trans
return false return false
cancelablePromise.abort() if cancelablePromise cancelablePromise.abort() if cancelablePromise
cancelablePromise = $rs.search.do($scope.projectId || $scope.vm.projectId, term)
cancelablePromise = $rs.search.do($scope.projectId, term)
cancelablePromise.then (res) => cancelablePromise.then (res) =>
# ignore wikipages if they're the only results. can't exclude them in search # ignore wikipages if they're the only results. can't exclude them in search
@ -441,15 +440,18 @@ MarkitupDirective = ($rootscope, $rs, $selectedText, $template, $compile, $trans
search: (term, callback) -> search: (term, callback) ->
term = taiga.slugify(term) term = taiga.slugify(term)
$rs.search.do($scope.projectId, term).then (res) => $rs.search.do($scope.projectId || $scope.vm.projectId, term).then (res) =>
if res.count < 1 if res.count < 1
console.log 1
callback([]) callback([])
if res.count < 1 or not res.wikipages or res.wikipages.length <= 0 if res.count < 1 or not res.wikipages or res.wikipages.length <= 0
console.log 2
callback([]) callback([])
else else
callback res.wikipages.filter((page) => callback res.wikipages.filter((page) =>
console.log 3
return taiga.slugify(page['slug']).indexOf(term) >= 0 return taiga.slugify(page['slug']).indexOf(term) >= 0
), true ), true