Nemcio/Redmine
1
0
Fork 0
mirror of https://github.com/redmine/redmine.git synced 2025-11-13 08:46:01 +01:00
Code Issues Packages Projects Releases Activity

Fixed: Issues counters in roadmap only link to issues in the same project (#9660).

Browse Source 
Contributed by Sridhar Dhanapalan.

git-svn-id: http://svn.redmine.org/redmine/trunk@13398 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Jean-Philippe Lang
2014-09-14 09:41:39 +00:00
parent 2eb95f41b4
commit 4fba4ca691
3 changed files with 85 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
app/helpers/versions_helper.rb
View File

@@ -27,6 +27,28 @@ module VersionsHelper
end
end
def version_filtered_issues_path(version, options = {})
options = {:fixed_version_id => version, :set_filter => 1}.merge(options)
project = case version.sharing
when 'hierarchy', 'tree'
if version.project && version.project.root.visible?
version.project.root
else
version.project
end
when 'system'
nil
else
version.project
end
if project
project_issues_path(project, options)
else
issues_path(options)
end
end
STATUS_BY_CRITERIAS = %w(tracker status priority author assigned_to category)
def render_issue_status_by(version, criteria)

24
app/views/versions/_overview.html.erb
View File

@@ -19,20 +19,16 @@
<%= progress_bar([version.closed_percent, version.completed_percent],
:width => '40em', :legend => ('%0.0f%' % version.completed_percent)) %>
<p class="progress-info">
<%= link_to(l(:label_x_issues, :count => version.issues_count),
project_issues_path(version.project,
:status_id => '*', :fixed_version_id => version,
:set_filter => 1)) %>
&nbsp;
(<%= link_to_if(version.closed_issues_count > 0,
l(:label_x_closed_issues_abbr, :count => version.closed_issues_count),
project_issues_path(version.project, :status_id => 'c',
:fixed_version_id => version, :set_filter => 1)) %>
&#8212;
<%= link_to_if(version.open_issues_count > 0,
l(:label_x_open_issues_abbr, :count => version.open_issues_count),
project_issues_path(version.project, :status_id => 'o',
:fixed_version_id => version, :set_filter => 1)) %>)
<%= link_to(l(:label_x_issues, :count => version.issues_count),
version_filtered_issues_path(version, :status_id => '*')) %>
&nbsp;
(<%= link_to_if(version.closed_issues_count > 0,
l(:label_x_closed_issues_abbr, :count => version.closed_issues_count),
version_filtered_issues_path(version, :status_id => 'c')) %>
&#8212;
<%= link_to_if(version.open_issues_count > 0,
l(:label_x_open_issues_abbr, :count => version.open_issues_count),
version_filtered_issues_path(version, :status_id => 'o')) %>)
</p>
<% else %>
<p class="progress-info"><%= l(:label_roadmap_no_issues) %></p>