Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
b97bce0a
Commit
b97bce0a
authored
Nov 03, 2017
by
Jarka Kadlecova
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Refactor issuables index actions
parent
43ec8c81
Changes
14
Hide whitespace changes
Inline
Side-by-side
Showing
14 changed files
with
81 additions
and
154 deletions
+81
-154
app/controllers/concerns/issuable_collections.rb
app/controllers/concerns/issuable_collections.rb
+51
-41
app/controllers/concerns/issues_action.rb
app/controllers/concerns/issues_action.rb
+4
-4
app/controllers/concerns/merge_requests_action.rb
app/controllers/concerns/merge_requests_action.rb
+4
-5
app/controllers/projects/issues_controller.rb
app/controllers/projects/issues_controller.rb
+7
-10
app/controllers/projects/merge_requests_controller.rb
app/controllers/projects/merge_requests_controller.rb
+7
-24
app/controllers/projects_controller.rb
app/controllers/projects_controller.rb
+2
-1
app/helpers/issuables_helper.rb
app/helpers/issuables_helper.rb
+0
-2
app/models/concerns/issuable.rb
app/models/concerns/issuable.rb
+2
-0
app/models/issue.rb
app/models/issue.rb
+0
-2
app/models/merge_request.rb
app/models/merge_request.rb
+0
-2
app/views/projects/issues/_nav_btns.html.haml
app/views/projects/issues/_nav_btns.html.haml
+2
-2
app/views/shared/issuable/_filter.html.haml
app/views/shared/issuable/_filter.html.haml
+0
-1
ee/app/controllers/ee/projects/issues_controller.rb
ee/app/controllers/ee/projects/issues_controller.rb
+2
-6
spec/controllers/concerns/issuable_collections_spec.rb
spec/controllers/concerns/issuable_collections_spec.rb
+0
-54
No files found.
app/controllers/concerns/issuable_collections.rb
View file @
b97bce0a
...
...
@@ -4,58 +4,44 @@ module IssuableCollections
include
Gitlab
::
IssuableMetadata
included
do
helper_method
:issues_finder
helper_method
:merge_requests_finder
helper_method
:finder
end
private
def
set_issues_index
@collection_type
=
"Issue"
@issues
=
issues_collection
@issues
=
@issues
.
page
(
params
[
:page
])
@issuable_meta_data
=
issuable_meta_data
(
@issues
,
@collection_type
)
@total_pages
=
issues_page_count
(
@issues
)
def
set_issuables_index
@issuables
=
issuables_collection
@issuables
=
@issuables
.
page
(
params
[
:page
])
@issuable_meta_data
=
issuable_meta_data
(
@issuables
,
collection_type
)
@total_pages
=
issuable_page_count
return
if
redirect_out_of_range
(
@
issues
,
@
total_pages
)
return
if
redirect_out_of_range
(
@total_pages
)
if
params
[
:label_name
].
present?
@labels
=
LabelsFinder
.
new
(
current_user
,
project_id:
@project
.
id
,
title:
params
[
:label_name
]).
execute
labels_params
=
{
project_id:
@project
.
id
,
title:
params
[
:label_name
]
}
@labels
=
LabelsFinder
.
new
(
current_user
,
labels_params
).
execute
end
@users
=
[]
end
def
issues_collection
issues_finder
.
execute
.
preload
(
:project
,
:author
,
:assignees
,
:labels
,
:milestone
,
project: :namespace
)
end
def
merge_requests_collection
merge_requests_finder
.
execute
.
preload
(
:source_project
,
:target_project
,
:author
,
:assignee
,
:labels
,
:milestone
,
head_pipeline: :project
,
target_project: :namespace
,
merge_request_diff: :merge_request_diff_commits
)
end
if
params
[
:assignee_id
].
present?
assignee
=
User
.
find_by_id
(
params
[
:assignee_id
])
@users
.
push
(
assignee
)
if
assignee
end
def
issues_finder
@issues_finder
||=
issuable_finder_for
(
IssuesFinder
)
if
params
[
:author_id
].
present?
author
=
User
.
find_by_id
(
params
[
:author_id
])
@users
.
push
(
author
)
if
author
end
end
def
merge_requests_finder
@merge_requests_finder
||=
issuable_finder_for
(
MergeRequestsFinder
)
def
issuables_collection
finder
.
execute
.
preload
(
preload_for_collection
)
end
def
redirect_out_of_range
(
relation
,
total_pages
)
def
redirect_out_of_range
(
total_pages
)
return
false
if
total_pages
.
zero?
out_of_range
=
relation
.
current_page
>
total_pages
out_of_range
=
@issuables
.
current_page
>
total_pages
if
out_of_range
redirect_to
(
url_for
(
params
.
merge
(
page:
total_pages
,
only_path:
true
)))
...
...
@@ -64,12 +50,8 @@ module IssuableCollections
out_of_range
end
def
issues_page_count
(
relation
)
page_count_for_relation
(
relation
,
issues_finder
.
row_count
)
end
def
merge_requests_page_count
(
relation
)
page_count_for_relation
(
relation
,
merge_requests_finder
.
row_count
)
def
issuable_page_count
page_count_for_relation
(
@issuables
,
finder
.
row_count
)
end
def
page_count_for_relation
(
relation
,
row_count
)
...
...
@@ -147,4 +129,32 @@ module IssuableCollections
else
value
end
end
def
finder
return
@finder
if
@finder
@finder_type
||=
finder_type
@finder
=
issuable_finder_for
(
@finder_type
)
end
def
collection_type
@collection_type
||=
case
finder
when
IssuesFinder
'Issue'
when
MergeRequestsFinder
'MergeRequest'
end
end
def
preload_for_collection
@preload_for_collection
||=
case
collection_type
when
'Issue'
[
:project
,
:author
,
:assignees
,
:labels
,
:milestone
,
project: :namespace
]
when
'MergeRequest'
[
:source_project
,
:target_project
,
:author
,
:assignee
,
:labels
,
:milestone
,
head_pipeline: :project
,
target_project: :namespace
,
merge_request_diff: :merge_request_diff_commits
]
end
end
end
app/controllers/concerns/issues_action.rb
View file @
b97bce0a
...
...
@@ -3,14 +3,14 @@ module IssuesAction
include
IssuableCollections
def
issues
@label
=
issues_finder
.
labels
.
first
@finder_type
=
IssuesFinder
@label
=
finder
.
labels
.
first
@issues
=
issues_collection
@issues
=
issu
abl
es_collection
.
non_archived
.
page
(
params
[
:page
])
@collection_type
=
"Issue"
@issuable_meta_data
=
issuable_meta_data
(
@issues
,
@collection_type
)
@issuable_meta_data
=
issuable_meta_data
(
@issues
,
collection_type
)
respond_to
do
|
format
|
format
.
html
...
...
app/controllers/concerns/merge_requests_action.rb
View file @
b97bce0a
...
...
@@ -3,13 +3,12 @@ module MergeRequestsAction
include
IssuableCollections
def
merge_requests
@label
=
merge_requests_finder
.
labels
.
first
@finder_type
=
MergeRequestsFinder
@label
=
finder
.
labels
.
first
@merge_requests
=
merge_requests_collection
.
page
(
params
[
:page
])
@merge_requests
=
issuables_collection
.
page
(
params
[
:page
])
@collection_type
=
"MergeRequest"
@issuable_meta_data
=
issuable_meta_data
(
@merge_requests
,
@collection_type
)
@issuable_meta_data
=
issuable_meta_data
(
@merge_requests
,
collection_type
)
end
private
...
...
app/controllers/projects/issues_controller.rb
View file @
b97bce0a
...
...
@@ -10,7 +10,8 @@ class Projects::IssuesController < Projects::ApplicationController
before_action
:check_issues_available!
before_action
:issue
,
except:
[
:index
,
:new
,
:create
,
:bulk_update
,
:export_csv
]
before_action
:set_issues_index
,
only:
[
:index
]
before_action
:set_issuables_index
,
only:
[
:index
]
# Allow write(create) issue
before_action
:authorize_create_issue!
,
only:
[
:new
,
:create
]
...
...
@@ -26,15 +27,7 @@ class Projects::IssuesController < Projects::ApplicationController
respond_to
:html
def
index
if
params
[
:assignee_id
].
present?
assignee
=
User
.
find_by_id
(
params
[
:assignee_id
])
@users
.
push
(
assignee
)
if
assignee
end
if
params
[
:author_id
].
present?
author
=
User
.
find_by_id
(
params
[
:author_id
])
@users
.
push
(
author
)
if
author
end
@issues
=
@issuables
respond_to
do
|
format
|
format
.
html
...
...
@@ -254,4 +247,8 @@ class Projects::IssuesController < Projects::ApplicationController
update_params
=
issue_params
.
merge
(
spammable_params
)
Issues
::
UpdateService
.
new
(
project
,
current_user
,
update_params
)
end
def
finder_type
IssuesFinder
end
end
app/controllers/projects/merge_requests_controller.rb
View file @
b97bce0a
...
...
@@ -13,33 +13,12 @@ class Projects::MergeRequestsController < Projects::MergeRequests::ApplicationCo
before_action
:authorize_update_issuable!
,
only:
[
:close
,
:edit
,
:update
,
:remove_wip
,
:sort
]
before_action
:set_issuables_index
,
only:
[
:index
]
before_action
:authenticate_user!
,
only:
[
:assign_related_issues
]
def
index
@collection_type
=
"MergeRequest"
@merge_requests
=
merge_requests_collection
@merge_requests
=
@merge_requests
.
page
(
params
[
:page
])
@merge_requests
=
@merge_requests
.
preload
(
merge_request_diff: :merge_request
)
@issuable_meta_data
=
issuable_meta_data
(
@merge_requests
,
@collection_type
)
@total_pages
=
merge_requests_page_count
(
@merge_requests
)
return
if
redirect_out_of_range
(
@merge_requests
,
@total_pages
)
if
params
[
:label_name
].
present?
labels_params
=
{
project_id:
@project
.
id
,
title:
params
[
:label_name
]
}
@labels
=
LabelsFinder
.
new
(
current_user
,
labels_params
).
execute
end
@users
=
[]
if
params
[
:assignee_id
].
present?
assignee
=
User
.
find_by_id
(
params
[
:assignee_id
])
@users
.
push
(
assignee
)
if
assignee
end
if
params
[
:author_id
].
present?
author
=
User
.
find_by_id
(
params
[
:author_id
])
@users
.
push
(
author
)
if
author
end
@merge_requests
=
@issuables
respond_to
do
|
format
|
format
.
html
...
...
@@ -349,4 +328,8 @@ class Projects::MergeRequestsController < Projects::MergeRequests::ApplicationCo
@target_project
=
@merge_request
.
target_project
@target_branches
=
@merge_request
.
target_project
.
repository
.
branch_names
end
def
finder_type
MergeRequestsFinder
end
end
app/controllers/projects_controller.rb
View file @
b97bce0a
...
...
@@ -278,7 +278,8 @@ class ProjectsController < Projects::ApplicationController
@project_wiki
=
@project
.
wiki
@wiki_home
=
@project_wiki
.
find_page
(
'home'
,
params
[
:version_id
])
elsif
@project
.
feature_available?
(
:issues
,
current_user
)
@issues
=
issues_collection
.
page
(
params
[
:page
])
@finder_type
=
IssuesFinder
@issues
=
issuables_collection
.
page
(
params
[
:page
])
@collection_type
=
'Issue'
@issuable_meta_data
=
issuable_meta_data
(
@issues
,
@collection_type
)
end
...
...
app/helpers/issuables_helper.rb
View file @
b97bce0a
...
...
@@ -250,8 +250,6 @@ module IssuablesHelper
end
def
issuables_count_for_state
(
issuable_type
,
state
)
finder
=
public_send
(
"
#{
issuable_type
}
_finder"
)
# rubocop:disable GitlabSecurity/PublicSend
Gitlab
::
IssuablesCountForState
.
new
(
finder
)[
state
]
end
...
...
app/models/concerns/issuable.rb
View file @
b97bce0a
...
...
@@ -17,6 +17,8 @@ module Issuable
include
Importable
include
Editable
include
AfterCommitQueue
include
Sortable
include
CreatedAtFilterable
# This object is used to gather issuable meta data for displaying
# upvotes, downvotes, notes and closing merge requests count for issues and merge requests
...
...
app/models/issue.rb
View file @
b97bce0a
...
...
@@ -8,12 +8,10 @@ class Issue < ActiveRecord::Base
include
Issuable
include
Noteable
include
Referable
include
Sortable
include
Spammable
include
Elastic
::
IssuesSearch
include
FasterCacheKeys
include
RelativePositioning
include
CreatedAtFilterable
include
TimeTrackable
WEIGHT_RANGE
=
1
..
9
...
...
app/models/merge_request.rb
View file @
b97bce0a
...
...
@@ -3,10 +3,8 @@ class MergeRequest < ActiveRecord::Base
include
Issuable
include
Noteable
include
Referable
include
Sortable
include
Elastic
::
MergeRequestsSearch
include
IgnorableColumn
include
CreatedAtFilterable
include
TimeTrackable
ignore_column
:locked_at
...
...
app/views/projects/issues/_nav_btns.html.haml
View file @
b97bce0a
...
...
@@ -12,8 +12,8 @@
=
button_tag
"Edit issues"
,
class:
"btn btn-default append-right-10 js-bulk-update-toggle"
=
link_to
"New issue"
,
new_project_issue_path
(
@project
,
issue:
{
assignee_id:
issues_
finder
.
assignee
.
try
(
:id
),
milestone_id:
issues_
finder
.
milestones
.
first
.
try
(
:id
)
}),
issue:
{
assignee_id:
finder
.
assignee
.
try
(
:id
),
milestone_id:
finder
.
milestones
.
first
.
try
(
:id
)
}),
class:
"btn btn-new"
,
title:
"New issue"
,
id:
"new_issue_link"
app/views/shared/issuable/_filter.html.haml
View file @
b97bce0a
-
finder
=
controller
.
controller_name
==
'issues'
?
issues_finder
:
merge_requests_finder
-
boards_page
=
controller
.
controller_name
==
'boards'
-
board
=
local_assigns
[
:board
]
...
...
ee/app/controllers/ee/projects/issues_controller.rb
View file @
b97bce0a
...
...
@@ -6,16 +6,12 @@ module EE
prepended
do
before_action
:check_export_issues_available!
,
only:
[
:export_csv
]
before_action
:check_service_desk_available!
,
only:
[
:service_desk
]
before_action
:set_issues_index
,
only:
[
:index
,
:service_desk
]
before_action
:set_issu
abl
es_index
,
only:
[
:index
,
:service_desk
]
skip_before_action
:issue
,
only:
[
:service_desk
]
end
def
service_desk
if
params
[
:assignee_id
].
present?
assignee
=
::
User
.
find_by_id
(
params
[
:assignee_id
])
@users
.
push
(
assignee
)
if
assignee
end
@issues
=
@issuables
@users
.
push
(
::
User
.
support_bot
)
end
...
...
spec/controllers/concerns/issuable_collections_spec.rb
View file @
b97bce0a
...
...
@@ -17,60 +17,6 @@ describe IssuableCollections do
controller
end
describe
'#redirect_out_of_range'
do
before
do
allow
(
controller
).
to
receive
(
:url_for
)
end
it
'returns true and redirects if the offset is out of range'
do
relation
=
double
(
:relation
,
current_page:
10
)
expect
(
controller
).
to
receive
(
:redirect_to
)
expect
(
controller
.
send
(
:redirect_out_of_range
,
relation
,
2
)).
to
eq
(
true
)
end
it
'returns false if the offset is not out of range'
do
relation
=
double
(
:relation
,
current_page:
1
)
expect
(
controller
).
not_to
receive
(
:redirect_to
)
expect
(
controller
.
send
(
:redirect_out_of_range
,
relation
,
2
)).
to
eq
(
false
)
end
end
describe
'#issues_page_count'
do
it
'returns the number of issue pages'
do
project
=
create
(
:project
,
:public
)
create
(
:issue
,
project:
project
)
finder
=
IssuesFinder
.
new
(
user
)
issues
=
finder
.
execute
allow
(
controller
).
to
receive
(
:issues_finder
)
.
and_return
(
finder
)
expect
(
controller
.
send
(
:issues_page_count
,
issues
)).
to
eq
(
1
)
end
end
describe
'#merge_requests_page_count'
do
it
'returns the number of merge request pages'
do
project
=
create
(
:project
,
:public
)
create
(
:merge_request
,
source_project:
project
,
target_project:
project
)
finder
=
MergeRequestsFinder
.
new
(
user
)
merge_requests
=
finder
.
execute
allow
(
controller
).
to
receive
(
:merge_requests_finder
)
.
and_return
(
finder
)
pages
=
controller
.
send
(
:merge_requests_page_count
,
merge_requests
)
expect
(
pages
).
to
eq
(
1
)
end
end
describe
'#page_count_for_relation'
do
it
'returns the number of pages'
do
relation
=
double
(
:relation
,
limit_value:
20
)
...
...
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