Commit dbb08f2a authored by Mark Chao's avatar Mark Chao

Rename existing Epic#issues to Epic#issues_readable_by

The name is reserved for more common association methods.
parent ceb0924c
...@@ -142,7 +142,7 @@ module EE ...@@ -142,7 +142,7 @@ module EE
def update_project_counter_caches def update_project_counter_caches
end end
def issues(current_user) def issues_readable_by(current_user)
related_issues = ::Issue.select('issues.*, epic_issues.id as epic_issue_id, epic_issues.relative_position') related_issues = ::Issue.select('issues.*, epic_issues.id as epic_issue_id, epic_issues.relative_position')
.joins(:epic_issue) .joins(:epic_issue)
.where("epic_issues.epic_id = #{id}") .where("epic_issues.epic_id = #{id}")
......
...@@ -5,7 +5,7 @@ module EpicIssues ...@@ -5,7 +5,7 @@ module EpicIssues
def issues def issues
return [] unless issuable&.group&.feature_available?(:epics) return [] unless issuable&.group&.feature_available?(:epics)
issuable.issues(current_user) issuable.issues_readable_by(current_user)
end end
def relation_path(issue) def relation_path(issue)
......
...@@ -53,7 +53,7 @@ module API ...@@ -53,7 +53,7 @@ module API
# For now we return empty body # For now we return empty body
# The issues list in the correct order in body will be returned as part of #4250 # The issues list in the correct order in body will be returned as part of #4250
if result if result
present epic.issues(current_user), present epic.issues_readable_by(current_user),
with: EE::API::Entities::EpicIssue, with: EE::API::Entities::EpicIssue,
current_user: current_user current_user: current_user
else else
...@@ -70,7 +70,7 @@ module API ...@@ -70,7 +70,7 @@ module API
get ':id/(-/)epics/:epic_iid/issues' do get ':id/(-/)epics/:epic_iid/issues' do
authorize_can_read! authorize_can_read!
present epic.issues(current_user), present epic.issues_readable_by(current_user),
with: EE::API::Entities::EpicIssue, with: EE::API::Entities::EpicIssue,
current_user: current_user current_user: current_user
end end
......
...@@ -180,7 +180,7 @@ describe Epic do ...@@ -180,7 +180,7 @@ describe Epic do
end end
end end
describe '#issues' do describe '#issues_readable_by' do
let(:user) { create(:user) } let(:user) { create(:user) }
let(:group) { create(:group, :private) } let(:group) { create(:group, :private) }
let(:project) { create(:project, group: group) } let(:project) { create(:project, group: group) }
...@@ -197,7 +197,7 @@ describe Epic do ...@@ -197,7 +197,7 @@ describe Epic do
] ]
end end
let(:result) { epic.issues(user) } let(:result) { epic.issues_readable_by(user) }
it 'returns all issues if a user has access to them' do it 'returns all issues if a user has access to them' do
group.add_developer(user) group.add_developer(user)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment