Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
heptapod
heptapod
Commits
94ffac5887d3
Commit
72ff7966
authored
Jul 28, 2018
by
Peter Leitzen
Browse files
Move finding autocompletion targets into AutocompleteService
parent
0ac62f61f35c
Changes
2
Hide whitespace changes
Inline
Side-by-side
app/controllers/projects/autocomplete_sources_controller.rb
View file @
94ffac58
class
Projects::AutocompleteSourcesController
<
Projects
::
ApplicationController
class
Projects::AutocompleteSourcesController
<
Projects
::
ApplicationController
before_action
:load_autocomplete_service
,
except:
[
:members
]
before_action
:load_autocomplete_service
def
members
def
members
render
json:
::
Projects
::
ParticipantsService
.
new
(
@project
,
current_user
).
execute
(
target
)
render
json:
::
Projects
::
ParticipantsService
.
new
(
@project
,
current_user
).
execute
(
target
)
...
@@ -32,13 +32,6 @@ def load_autocomplete_service
...
@@ -32,13 +32,6 @@ def load_autocomplete_service
end
end
def
target
def
target
case
params
[
:type
]
&
.
downcase
@autocomplete_service
.
target
(
params
[
:type
],
params
[
:type_id
])
when
'issue'
IssuesFinder
.
new
(
current_user
,
project_id:
@project
.
id
).
find_by
(
iid:
params
[
:type_id
])
||
@project
.
issues
.
build
when
'mergerequest'
MergeRequestsFinder
.
new
(
current_user
,
project_id:
@project
.
id
).
find_by
(
iid:
params
[
:type_id
])
||
@project
.
merge_requests
.
build
when
'commit'
@project
.
commit
(
params
[
:type_id
])
end
end
end
end
end
app/services/projects/autocomplete_service.rb
View file @
94ffac58
...
@@ -51,5 +51,16 @@ def commands(noteable, type)
...
@@ -51,5 +51,16 @@ def commands(noteable, type)
QuickActions
::
InterpretService
.
new
(
project
,
current_user
).
available_commands
(
noteable
)
QuickActions
::
InterpretService
.
new
(
project
,
current_user
).
available_commands
(
noteable
)
end
end
def
target
(
type
,
type_id
)
case
type
&
.
downcase
when
'issue'
IssuesFinder
.
new
(
current_user
,
project_id:
project
.
id
).
find_by
(
iid:
type_id
)
||
project
.
issues
.
build
when
'mergerequest'
MergeRequestsFinder
.
new
(
current_user
,
project_id:
project
.
id
).
find_by
(
iid:
type_id
)
||
project
.
merge_requests
.
build
when
'commit'
project
.
commit
(
type_id
)
end
end
end
end
end
end
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