Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in
Toggle navigation
O
OHR Support
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
97
Issues
97
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
Wiki
Wiki
image/svg+xml
Discourse
Discourse
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Projects
OHR Support
Commits
800cee54
Commit
800cee54
authored
May 05, 2011
by
Felix Schäfer
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request
#46
from schmidt/b/373-duplicates-in-issue-autocomplete
Avoid duplicates in issue autocomplete.
#373
parents
5938048e
dbd6dfc6
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
15 additions
and
14 deletions
+15
-14
auto_completes_controller.rb
app/controllers/auto_completes_controller.rb
+8
-7
auto_completes_controller_test.rb
test/functional/auto_completes_controller_test.rb
+7
-7
No files found.
app/controllers/auto_completes_controller.rb
View file @
800cee54
...
...
@@ -4,17 +4,18 @@ class AutoCompletesController < ApplicationController
def
issues
@issues
=
[]
q
=
params
[
:q
].
to_s
query
=
(
params
[
:scope
]
==
"all"
&&
Setting
.
cross_project_issue_relations?
)
?
Issue
:
@project
.
issues
if
q
.
match
(
/^\d+$/
)
@issues
<<
query
.
visible
.
find_by_id
(
q
.
to_i
)
end
unless
q
.
blank?
@issues
+=
query
.
visible
.
find
(
:all
,
if
q
.
present?
query
=
(
params
[
:scope
]
==
"all"
&&
Setting
.
cross_project_issue_relations?
)
?
Issue
:
@project
.
issues
@issues
|=
query
.
visible
.
find_all_by_id
(
q
.
to_i
)
if
q
=~
/^\d+$/
@issues
|=
query
.
visible
.
find
(
:all
,
:limit
=>
10
,
:order
=>
"
#{
Issue
.
table_name
}
.id ASC"
,
:conditions
=>
[
"LOWER(
#{
Issue
.
table_name
}
.subject) LIKE :q OR CAST(
#{
Issue
.
table_name
}
.id AS CHAR(13)) LIKE :q"
,
{
:q
=>
"%
#{
q
.
downcase
}
%"
}])
end
@issues
.
compact!
render
:layout
=>
false
end
...
...
test/functional/auto_completes_controller_test.rb
View file @
800cee54
...
...
@@ -20,19 +20,19 @@ class AutoCompletesControllerTest < ActionController::TestCase
test
'should return issues matching a given id'
do
@project
=
Project
.
find
(
'subproject1'
)
@issue_21
=
Issue
.
generate_for_project!
(
@project
,
:id
=>
21
)
@issue_
101
=
Issue
.
generate_for_project!
(
@project
,
:id
=>
101
)
@issue_
102
=
Issue
.
generate_for_project!
(
@project
,
:id
=>
102
)
@issue_with_subject
=
Issue
.
generate_for_project!
(
@project
,
:subject
=>
'This has 1 in the subject'
)
@issue_
2101
=
Issue
.
generate_for_project!
(
@project
,
:id
=>
2
101
)
@issue_
2102
=
Issue
.
generate_for_project!
(
@project
,
:id
=>
2
102
)
@issue_with_subject
=
Issue
.
generate_for_project!
(
@project
,
:subject
=>
'This has
2
1 in the subject'
)
get
:issues
,
:project_id
=>
@project
.
id
,
:q
=>
'1'
get
:issues
,
:project_id
=>
@project
.
id
,
:q
=>
'
2
1'
assert_response
:success
assert_not_nil
assigns
(
:issues
)
assert
assigns
(
:issues
).
include?
(
Issue
.
find
(
13
))
assert
assigns
(
:issues
).
include?
(
@issue_21
)
assert
assigns
(
:issues
).
include?
(
@issue_101
)
assert
assigns
(
:issues
).
include?
(
@issue_102
)
assert
assigns
(
:issues
).
include?
(
@issue_
2
101
)
assert
assigns
(
:issues
).
include?
(
@issue_
2
102
)
assert
assigns
(
:issues
).
include?
(
@issue_with_subject
)
assert_equal
assigns
(
:issues
).
size
,
assigns
(
:issues
).
uniq
.
size
,
"Issues list includes duplicates"
end
def
test_auto_complete_with_scope_all_and_cross_project_relations
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment