jro_apps/redmine Commit - r1149:09bd61da7436

1

1

2

3

<% if @versions.empty? %>

3

<% if @versions.empty? %>

4

4

5

<% end %>

5

<% end %>

6

7

<% @versions.each do |version| %>

7

<% @versions.each do |version| %>

8

<%= tag 'a', :name => version.name %>

8

<%= tag 'a', :name => version.name %>

9

<h3 class="icon22 icon22-package"><%= link_to h(version.name), :controller => 'versions', :action => 'show', :id => version %></h3>

9

<h3 class="icon22 icon22-package"><%= link_to h(version.name), :controller => 'versions', :action => 'show', :id => version %></h3>

10

<%= render :partial => 'versions/overview', :locals => {:version => version} %>

10

<%= render :partial => 'versions/overview', :locals => {:version => version} %>

11

<%= render(:partial => "wiki/content", :locals => {:content => version.wiki_page.content}) if version.wiki_page %>

11

<%= render(:partial => "wiki/content", :locals => {:content => version.wiki_page.content}) if version.wiki_page %>

12

13

<% issues = version.fixed_issues.find(:all,

13

<% issues = version.fixed_issues.find(:all,

14

:include => [:status, :tracker],

14

:include => [:status, :tracker],

15

:conditions => ["tracker_id in (#{@selected_tracker_ids.join(',')})"],

15

:conditions => ["tracker_id in (#{@selected_tracker_ids.join(',')})"],

16

:order => "#{Tracker.table_name}.position") unless @selected_tracker_ids.empty?

16

:order => "#{Tracker.table_name}.position, #{Issue.table_name}.id") unless @selected_tracker_ids.empty?

17

issues ||= []

17

issues ||= []

18

%>

18

%>

19

<ul>

19

<ul>

20

<% if issues.size > 0 %>

20

<% if issues.size > 0 %>

21

<% issues.each do |issue| %>

21

<% issues.each do |issue| %>

22

<li>

22

<li>

23

<%= link = link_to_issue(issue)

23

<%= link = link_to_issue(issue)

24

issue.status.is_closed? ? content_tag("del", link) : link %>: <%=h issue.subject %>

24

issue.status.is_closed? ? content_tag("del", link) : link %>: <%=h issue.subject %>

25

<%= content_tag "em", "(#{l(:label_closed_issues)})" if issue.status.is_closed? %>

25

<%= content_tag "em", "(#{l(:label_closed_issues)})" if issue.status.is_closed? %>

26

</li>

26

</li>

27

<% end %>

27

<% end %>

28

<% end %>

28

<% end %>

29

</ul>

29

</ul>

30

<% end %>

30

<% end %>

31

32

<% content_for :sidebar do %>

32

<% content_for :sidebar do %>

33

<% form_tag do %>

33

<% form_tag do %>

34

34

35

<% @trackers.each do |tracker| %>

35

<% @trackers.each do |tracker| %>

36

36

37

<%= tracker.name %></label><br />

37

<%= tracker.name %></label><br />

38

<% end %>

38

<% end %>

39

<br />

39

<br />

40

40

41

<p><%= submit_tag l(:button_apply), :class => 'button-small' %></p>

41

<p><%= submit_tag l(:button_apply), :class => 'button-small' %></p>

42

<% end %>

42

<% end %>

43

44

44

45

<% @versions.each do |version| %>

45

<% @versions.each do |version| %>

46

<%= link_to version.name, :anchor => version.name %><br />

46

<%= link_to version.name, :anchor => version.name %><br />

47

<% end %>

47

<% end %>

48

<% end %>

48

<% end %>

49

50

<% html_title(l(:label_roadmap)) %>

50

<% html_title(l(:label_roadmap)) %>

	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

             <h2><%=l(:label_roadmap)%></h2>
             <% if @versions.empty? %>
             <p class="nodata"><%= l(:label_no_data) %></p>
             <% end %>
             <% @versions.each do |version| %>
                 <%= tag 'a', :name => version.name %>
                 <h3 class="icon22 icon22-package"><%= link_to h(version.name), :controller => 'versions', :action => 'show', :id => version %></h3>
                 <%= render :partial => 'versions/overview', :locals => {:version => version} %>
                 <%= render(:partial => "wiki/content", :locals => {:content => version.wiki_page.content}) if version.wiki_page %>
                 <% issues = version.fixed_issues.find(:all,
                                                       :include => [:status, :tracker],
                                                       :conditions => ["tracker_id in (#{@selected_tracker_ids.join(',')})"],
-                                                      :order => "#{Tracker.table_name}.position") unless @selected_tracker_ids.empty?
+                                                      :order => "#{Tracker.table_name}.position, #{Issue.table_name}.id") unless @selected_tracker_ids.empty?
                    issues ||= []
                 %>
                 <ul>
                   <% if issues.size > 0 %>
                     <% 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 %>
             <% content_for :sidebar do %>
             <% form_tag do %>
             <h3><%= l(:label_roadmap) %></h3>
             <% @trackers.each do |tracker| %>
               <label><%= check_box_tag "tracker_ids[]", tracker.id, (@selected_tracker_ids.include? tracker.id.to_s) %>
               <%= tracker.name %></label><br />
             <% end %>
             <br />
             <label for="completed"><%= check_box_tag "completed", 1, params[:completed] %> <%= l(:label_show_completed_versions) %>
             <p><%= submit_tag l(:button_apply), :class => 'button-small' %></p>
             <% end %>
             <h3><%= l(:label_version_plural) %></h3>
             <% @versions.each do |version| %>
             <%= link_to version.name, :anchor => version.name %><br />
             <% end %>
             <% end %>
             <% html_title(l(:label_roadmap)) %>