##// END OF EJS Templates
jro_apps » redmine
RSS
Fixed: SQL error on roadmap and changelog if there is no tracker to display....
Jean-Philippe Lang -
r633:f94be4f8ab84
parent child
Show More
Show file before | Show file after | Hide comments
@@ -1,36 +1,37
1 1 <h2><%=l(:label_change_log)%></h2>
2 2
3 3 <div class="rightbox" style="width:140px;">
4 4 <% form_tag do %>
5 5 <p><strong><%=l(:label_tracker_plural)%></strong><br />
6 6 <% @trackers.each do |tracker| %>
7 7 <%= check_box_tag "tracker_ids[]", tracker.id, (@selected_tracker_ids.include? tracker.id.to_s) %>
8 8 <%= tracker.name %><br />
9 9 <% end %></p>
10 10 <p><center><%= submit_tag l(:button_apply), :class => 'button-small' %></center></p>
11 11 <% end %>
12 12 </div>
13 13
14 14 <% if @versions.empty? %><p><i><%= l(:label_no_data) %></i></p><% end %>
15 15
16 16 <% @versions.each do |version| %>
17 17 <a name="<%= version.name %>"><h3 class="icon22 icon22-package"><%= version.name %></h3></a>
18 18 <% if version.completed? %>
19 19 <p><%= format_date(version.effective_date) %></p>
20 20 <% elsif version.effective_date %>
21 21 <p><strong><%=l(:label_roadmap_due_in)%> <%= distance_of_time_in_words Time.now, version.effective_date %> (<%= format_date(version.effective_date) %>)</strong></p>
22 22 <% end %>
23 23 <p><%=h version.description %></p>
24 24 <% issues = version.fixed_issues.find(:all,
25 25 :include => [:status, :tracker],
26 26 :conditions => ["#{IssueStatus.table_name}.is_closed=? AND #{Issue.table_name}.tracker_id in (#{@selected_tracker_ids.join(',')})", true],
27 :order => "#{Tracker.table_name}.position")
27 :order => "#{Tracker.table_name}.position") unless @selected_tracker_ids.empty?
28 issues ||= []
28 29 %>
29 30 <% if !issues.empty? %>
30 31 <ul>
31 32 <% issues.each do |issue| %>
32 33 <li><%= link_to_issue(issue) %>: <%=h issue.subject %></li>
33 34 <% end %>
34 35 </ul>
35 36 <% end %>
36 37 <% end %>
Show file before | Show file after | Hide comments
@@ -1,64 +1,65
1 1 <h2><%=l(:label_roadmap)%></h2>
2 2
3 3 <div class="rightbox">
4 4 <% form_tag do %>
5 5 <p><strong><%=l(:label_tracker_plural)%></strong><br />
6 6 <% @trackers.each do |tracker| %>
7 7 <%= check_box_tag "tracker_ids[]", tracker.id, (@selected_tracker_ids.include? tracker.id.to_s) %>
8 8 <%= tracker.name %><br />
9 9 <% end %></p>
10 10 <p class="small"><label for="completed"><%= check_box_tag "completed", 1, params[:completed] %> <%= l(:label_show_completed_versions) %></label></p>
11 11 <p><center><%= submit_tag l(:button_apply), :class => 'button-small' %></center></p>
12 12 <% end %>
13 13 </div>
14 14
15 15 <% if @versions.empty? %><p><i><%= l(:label_no_data) %></i></p><% end %>
16 16
17 17 <% @versions.each do |version| %>
18 18 <a name="<%= version.name %>"><h3 class="icon22 icon22-package"><%= version.name %></h3></a>
19 19 <% if version.completed? %>
20 20 <p><%= format_date(version.effective_date) %></p>
21 21 <% elsif version.overdue? %>
22 22 <p><strong><%= l(:label_roadmap_overdue, distance_of_time_in_words(Time.now, version.effective_date)) %> (<%= format_date(version.effective_date) %>)</strong></p>
23 23 <% elsif version.effective_date %>
24 24 <p><strong><%=l(:label_roadmap_due_in)%> <%= distance_of_time_in_words Time.now, version.effective_date %> (<%= format_date(version.effective_date) %>)</strong></p>
25 25 <% end %>
26 26 <p><%=h version.description %></p>
27 27 <% issues = version.fixed_issues.find(:all,
28 28 :include => [:status, :tracker],
29 29 :conditions => ["tracker_id in (#{@selected_tracker_ids.join(',')})"],
30 :order => "#{Tracker.table_name}.position")
30 :order => "#{Tracker.table_name}.position") unless @selected_tracker_ids.empty?
31 issues ||= []
31 32
32 33 total = issues.size
33 34 complete = issues.inject(0) {|c,i| i.status.is_closed? ? c + 1 : c }
34 35 percentComplete = total == 0 ? 100 : (100.0 / total * complete).floor
35 36 percentIncomplete = 100 - percentComplete
36 37 %>
37 38 <table class="progress">
38 39 <tr>
39 40 <% if percentComplete > 0 %>
40 41 <td class="closed" style="width: <%= percentComplete %>%"></td>
41 42 <% end; if percentIncomplete > 0 %>
42 43 <td class="open" style="width: <%= percentIncomplete %>%"></td>
43 44 <% end %>
44 45 </tr>
45 46 </table>
46 47 <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;
47 48 <%= 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>
48 49 <br />
49 50 <br />
50 51 <%= render(:partial => "wiki/content", :locals => {:content => version.wiki_page.content}) if version.wiki_page %>
51 52 <ul>
52 53 <% if total == 0 %>
53 54 <li><%=l(:label_roadmap_no_issues)%></li>
54 55 <% else %>
55 56 <% issues.each do |issue| %>
56 57 <li>
57 58 <%= link = link_to_issue(issue)
58 59 issue.status.is_closed? ? content_tag("del", link) : link %>: <%=h issue.subject %>
59 60 <%= content_tag "em", "(#{l(:label_closed_issues)})" if issue.status.is_closed? %>
60 61 </li>
61 62 <% end %>
62 63 <% end %>
63 64 </ul>
64 65 <% end %>
General Comments 0
You need to be logged in to leave comments. Login now