jro_apps/redmine Commit - r633:f94be4f8ab84

Fixed: SQL error on roadmap and changelog if there is no tracker to display....

Jean-Philippe Lang -

r633:f94be4f8ab84

parent child

Context file:

r633:f94be4f8ab84

Collapse all files

app/views/projects/changelog.rhtml +2 -1

             <h2><%=l(:label_change_log)%></h2>
             <div class="rightbox" style="width:140px;">
             <% form_tag do %>
             <p><strong><%=l(:label_tracker_plural)%></strong><br />
             <% @trackers.each do |tracker| %>
               <%= check_box_tag "tracker_ids[]", tracker.id, (@selected_tracker_ids.include? tracker.id.to_s) %>
               <%= tracker.name %><br />
             <% end %></p>
             <p><center><%= submit_tag l(:button_apply), :class => 'button-small' %></center></p>
             <% end %>
             </div>
             <% if @versions.empty? %><p><i><%= l(:label_no_data) %></i></p><% end %>
             <% @versions.each do |version| %>
                 <a name="<%= version.name %>"><h3 class="icon22 icon22-package"><%= version.name %></h3></a>
                 <% if version.completed? %>
                   <p><%= format_date(version.effective_date) %></p>
                 <% elsif version.effective_date %>
                   <p><strong><%=l(:label_roadmap_due_in)%> <%= distance_of_time_in_words Time.now, version.effective_date %> (<%= format_date(version.effective_date) %>)</strong></p>
                 <% end %>
                 <p><%=h version.description %></p>
                 <% 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>
                   <% issues.each do |issue| %>
                     <li><%= link_to_issue(issue) %>: <%=h issue.subject %></li>
                   <% end %>
                 </ul>
                 <% end %>
             <% end %>

app/views/projects/roadmap.rhtml +2 -1

             <h2><%=l(:label_roadmap)%></h2>
             <div class="rightbox">
             <% form_tag do %>
             <p><strong><%=l(:label_tracker_plural)%></strong><br />
             <% @trackers.each do |tracker| %>
               <%= check_box_tag "tracker_ids[]", tracker.id, (@selected_tracker_ids.include? tracker.id.to_s) %>
               <%= tracker.name %><br />
             <% end %></p>
             <p class="small"><label for="completed"><%= check_box_tag "completed", 1, params[:completed] %> <%= l(:label_show_completed_versions) %></label></p>
             <p><center><%= submit_tag l(:button_apply), :class => 'button-small' %></center></p>
             <% end %>
             </div>
             <% if @versions.empty? %><p><i><%= l(:label_no_data) %></i></p><% end %>
             <% @versions.each do |version| %>
                 <a name="<%= version.name %>"><h3 class="icon22 icon22-package"><%= version.name %></h3></a>
                 <% if version.completed? %>
                   <p><%= format_date(version.effective_date) %></p>
                 <% elsif version.overdue? %>
                   <p><strong><%= l(:label_roadmap_overdue, distance_of_time_in_words(Time.now, version.effective_date)) %> (<%= format_date(version.effective_date) %>)</strong></p>
                 <% elsif version.effective_date %>
                   <p><strong><%=l(:label_roadmap_due_in)%> <%= distance_of_time_in_words Time.now, version.effective_date %> (<%= format_date(version.effective_date) %>)</strong></p>
                 <% end %>
                 <p><%=h version.description %></p>
                 <% 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 }
                    percentComplete = total == 0 ? 100 : (100.0 / total * complete).floor
                    percentIncomplete = 100 - percentComplete
                 %>
                 <table class="progress">
                   <tr>
             	<% if percentComplete > 0 %>
                       <td class="closed" style="width: <%= percentComplete %>%"></td>
                     <% end; if percentIncomplete > 0 %>
                       <td class="open" style="width: <%= percentIncomplete %>%"></td>
                     <% end %>
                   </tr>
                 </table>
                 <em><%= link_to(complete, :controller => 'projects', :action => 'list_issues', :id => @project, :status_id => 'c', :fixed_version_id => version, :set_filter => 1) %> <%= lwr(:label_closed_issues, complete) %> (<%= percentComplete %>%) &#160;
                     <%= link_to((total - complete), :controller => 'projects', :action => 'list_issues', :id => @project, :status_id => 'o', :fixed_version_id => version, :set_filter => 1) %> <%= lwr(:label_open_issues, total - complete)%> (<%= percentIncomplete %>%)</em>
                 <br />
                 <br />
                 <%= render(:partial => "wiki/content", :locals => {:content => version.wiki_page.content}) if version.wiki_page %>
                 <ul>
                   <% if total == 0 %>
                     <li><%=l(:label_roadmap_no_issues)%></li>
                   <% else %>
                     <% issues.each do |issue| %>
                       <li>
                         <%= link = link_to_issue(issue)
                             issue.status.is_closed? ? content_tag("del", link) : link %>: <%=h issue.subject %>
                         <%= content_tag "em", "(#{l(:label_closed_issues)})" if issue.status.is_closed? %>
                       </li>
                     <% end %>
                   <% end %>
                 </ul>
             <% end %>

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages