diff options
author | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2007-08-15 10:45:46 +0000 |
---|---|---|
committer | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2007-08-15 10:45:46 +0000 |
commit | f94be4f8ab84d78800e46860994fbd91634111c8 (patch) | |
tree | 81bba4d3d667740da457686192066f24519f12ca /app/views/projects | |
parent | 3eec500320b1488e53b8e21d83532a4feceb160d (diff) | |
download | redmine-f94be4f8ab84d78800e46860994fbd91634111c8.tar.gz redmine-f94be4f8ab84d78800e46860994fbd91634111c8.zip |
Fixed: SQL error on roadmap and changelog if there is no tracker to display.
git-svn-id: http://redmine.rubyforge.org/svn/trunk@636 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app/views/projects')
-rw-r--r-- | app/views/projects/changelog.rhtml | 3 | ||||
-rw-r--r-- | app/views/projects/roadmap.rhtml | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/app/views/projects/changelog.rhtml b/app/views/projects/changelog.rhtml index c76159471..490b85708 100644 --- a/app/views/projects/changelog.rhtml +++ b/app/views/projects/changelog.rhtml @@ -24,7 +24,8 @@ <% issues = version.fixed_issues.find(:all, :include => [:status, :tracker], :conditions => ["#{IssueStatus.table_name}.is_closed=? AND #{Issue.table_name}.tracker_id in (#{@selected_tracker_ids.join(',')})", true], - :order => "#{Tracker.table_name}.position") + :order => "#{Tracker.table_name}.position") unless @selected_tracker_ids.empty? + issues ||= [] %> <% if !issues.empty? %> <ul> diff --git a/app/views/projects/roadmap.rhtml b/app/views/projects/roadmap.rhtml index 9deb6d20d..1011bcbff 100644 --- a/app/views/projects/roadmap.rhtml +++ b/app/views/projects/roadmap.rhtml @@ -27,7 +27,8 @@ <% issues = version.fixed_issues.find(:all, :include => [:status, :tracker], :conditions => ["tracker_id in (#{@selected_tracker_ids.join(',')})"], - :order => "#{Tracker.table_name}.position") + :order => "#{Tracker.table_name}.position") unless @selected_tracker_ids.empty? + issues ||= [] total = issues.size complete = issues.inject(0) {|c,i| i.status.is_closed? ? c + 1 : c } |