##// END OF EJS Templates
Fixed: versions not sorted correctly in drop down lists....
Jean-Philippe Lang -
r613:29f25601bbe1
parent child
Show More
@@ -1,40 +1,40
1 1 <h2><%=l(:label_issue)%> #<%= @issue.id %>: <%=h @issue.subject %></h2>
2 2
3 3 <%= error_messages_for 'issue' %>
4 4 <% labelled_tabular_form_for(:issue, @issue, :url => {:action => 'change_status', :id => @issue}, :html => {:multipart => true}) do |f| %>
5 5
6 6 <%= hidden_field_tag 'confirm', 1 %>
7 7 <%= hidden_field_tag 'new_status_id', @new_status.id %>
8 8 <%= f.hidden_field :lock_version %>
9 9
10 10 <div class="box">
11 11 <div class="splitcontentleft">
12 12 <p><label><%=l(:label_issue_status_new)%></label> <%= @new_status.name %></p>
13 13 <p><%= f.select :assigned_to_id, (@issue.project.members.collect {|m| [m.name, m.user_id]}), :include_blank => true %></p>
14 14 <p><%= f.select :done_ratio, ((0..10).to_a.collect {|r| ["#{r*10} %", r*10] }) %></p>
15 <p><%= f.select :fixed_version_id, (@project.versions.collect {|v| [v.name, v.id]}), { :include_blank => true } %></p>
15 <p><%= f.select :fixed_version_id, (@project.versions.sort.collect {|v| [v.name, v.id]}), { :include_blank => true } %></p>
16 16 </div>
17 17 <div class="splitcontentright">
18 18 <% if authorize_for('timelog', 'edit') %>
19 19 <% fields_for :time_entry, @time_entry, { :builder => TabularFormBuilder, :lang => current_language} do |time_entry| %>
20 20 <p><%= time_entry.text_field :hours, :size => 6, :label => :label_spent_time %> <%= l(:field_hours) %></p>
21 21 <p><%= time_entry.text_field :comments, :size => 40 %></p>
22 22 <p><%= time_entry.select :activity_id, (@activities.collect {|p| [p.name, p.id]}) %></p>
23 23 <% end %>
24 24 <% end %>
25 25 </div>
26 26
27 27 <div class="clear"></div>
28 28
29 29 <p><label for="notes"><%= l(:field_notes) %></label>
30 30 <%= text_area_tag 'notes', @notes, :cols => 60, :rows => 10, :class => 'wiki-edit' %></p>
31 31
32 32 <% if authorize_for('issues', 'add_attachment') %>
33 33 <p id="attachments_p"><label><%=l(:label_attachment_new)%>
34 34 <%= image_to_function "add.png", "addFileField();return false" %></label>
35 35 <%= file_field_tag 'attachments[]', :size => 30 %> <em>(<%= l(:label_max_size) %>: <%= number_to_human_size(Setting.attachment_max_size.to_i.kilobytes) %>)</em></p>
36 36 <% end %>
37 37 </div>
38 38
39 39 <%= submit_tag l(:button_save) %>
40 40 <% end %>
@@ -1,43 +1,43
1 1 <h2><%= @issue.tracker.name %> #<%= @issue.id %> - <%=h @issue.subject %></h2>
2 2
3 3 <% labelled_tabular_form_for :issue, @issue, :url => {:action => 'edit'} do |f| %>
4 4 <%= error_messages_for 'issue' %>
5 5 <div class="box">
6 6 <!--[form:issue]-->
7 7 <div class="splitcontentleft">
8 8 <p><label><%=l(:field_status)%></label> <%= @issue.status.name %></p>
9 9 <p><%= f.select :priority_id, (@priorities.collect {|p| [p.name, p.id]}), :required => true %></p>
10 10 <p><%= f.select :assigned_to_id, (@issue.project.members.collect {|m| [m.name, m.user_id]}), :include_blank => true %></p>
11 11 <p><%= f.select :category_id, (@project.issue_categories.collect {|c| [c.name, c.id]}), :include_blank => true %></p>
12 12 </div>
13 13
14 14 <div class="splitcontentright">
15 15 <p><%= f.text_field :start_date, :size => 10 %><%= calendar_for('issue_start_date') %></p>
16 16 <p><%= f.text_field :due_date, :size => 10 %><%= calendar_for('issue_due_date') %></p>
17 17 <p><%= f.select :done_ratio, ((0..10).to_a.collect {|r| ["#{r*10} %", r*10] }) %></p>
18 18 </div>
19 19
20 20 <div class="clear">
21 21 <p><%= f.text_field :subject, :size => 80, :required => true %></p>
22 22 <p><%= f.text_area :description, :required => true, :cols => 60, :rows => [[10, @issue.description.length / 50].max, 100].min, :class => 'wiki-edit' %></p>
23 23
24 24 <% for @custom_value in @custom_values %>
25 25 <p><%= custom_field_tag_with_label @custom_value %></p>
26 26 <% end %>
27 27
28 <p><%= f.select :fixed_version_id, (@project.versions.collect {|v| [v.name, v.id]}), { :include_blank => true } %></p>
28 <p><%= f.select :fixed_version_id, (@project.versions.sort.collect {|v| [v.name, v.id]}), { :include_blank => true } %></p>
29 29 </div>
30 30 <!--[eoform:issue]-->
31 31 </div>
32 32 <%= f.hidden_field :lock_version %>
33 33 <%= submit_tag l(:button_save) %>
34 34 <% end %>
35 35
36 36 <%= wikitoolbar_for 'issue_description' %>
37 37
38 38 <% content_for :header_tags do %>
39 39 <%= javascript_include_tag 'calendar/calendar' %>
40 40 <%= javascript_include_tag "calendar/lang/calendar-#{current_language}.js" %>
41 41 <%= javascript_include_tag 'calendar/calendar-setup' %>
42 42 <%= stylesheet_link_tag 'calendar' %>
43 43 <% end %> No newline at end of file
@@ -1,48 +1,48
1 1 <h2><%=l(:label_issue_new)%>: <%= @tracker.name %></h2>
2 2
3 3 <% labelled_tabular_form_for :issue, @issue, :url => {:action => 'add_issue'}, :html => {:multipart => true} do |f| %>
4 4 <%= error_messages_for 'issue' %>
5 5 <div class="box">
6 6 <!--[form:issue]-->
7 7 <%= hidden_field_tag 'tracker_id', @tracker.id %>
8 8
9 9 <div class="splitcontentleft">
10 10 <p><%= f.select :status_id, (@allowed_statuses.collect {|p| [p.name, p.id]}), :required => true %></p>
11 11 <p><%= f.select :priority_id, (@priorities.collect {|p| [p.name, p.id]}), :required => true %></p>
12 12 <p><%= f.select :assigned_to_id, (@issue.project.members.collect {|m| [m.name, m.user_id]}), :include_blank => true %></p>
13 13 <p><%= f.select :category_id, (@project.issue_categories.collect {|c| [c.name, c.id]}), :include_blank => true %></p>
14 14 </div>
15 15 <div class="splitcontentright">
16 16 <p><%= f.text_field :start_date, :size => 10 %><%= calendar_for('issue_start_date') %></p>
17 17 <p><%= f.text_field :due_date, :size => 10 %><%= calendar_for('issue_due_date') %></p>
18 18 <p><%= f.select :done_ratio, ((0..10).to_a.collect {|r| ["#{r*10} %", r*10] }) %></p>
19 19 </div>
20 20
21 21 <div class="clear">
22 22 <p><%= f.text_field :subject, :size => 80, :required => true %></p>
23 23 <p><%= f.text_area :description, :cols => 60, :rows => 10, :required => true, :class => 'wiki-edit' %></p>
24 24
25 25 <% for @custom_value in @custom_values %>
26 26 <p><%= custom_field_tag_with_label @custom_value %></p>
27 27 <% end %>
28 28
29 <p><%= f.select :fixed_version_id, (@project.versions.collect {|v| [v.name, v.id]}), { :include_blank => true } %></p>
29 <p><%= f.select :fixed_version_id, (@project.versions.sort.collect {|v| [v.name, v.id]}), { :include_blank => true } %></p>
30 30
31 31 <p id="attachments_p"><label for="attachment_file"><%=l(:label_attachment)%>
32 32 <%= image_to_function "add.png", "addFileField();return false" %></label>
33 33 <%= file_field_tag 'attachments[]', :size => 30 %> <em>(<%= l(:label_max_size) %>: <%= number_to_human_size(Setting.attachment_max_size.to_i.kilobytes) %>)</em></p>
34 34
35 35 </div>
36 36 <!--[eoform:issue]-->
37 37 </div>
38 38 <%= submit_tag l(:button_create) %>
39 39 <% end %>
40 40
41 41 <%= wikitoolbar_for 'issue_description' %>
42 42
43 43 <% content_for :header_tags do %>
44 44 <%= javascript_include_tag 'calendar/calendar' %>
45 45 <%= javascript_include_tag "calendar/lang/calendar-#{current_language}.js" %>
46 46 <%= javascript_include_tag 'calendar/calendar-setup' %>
47 47 <%= stylesheet_link_tag 'calendar' %>
48 48 <% end %> No newline at end of file
General Comments 0
You need to be logged in to leave comments. Login now