jro_apps/redmine Commit - r613:29f25601bbe1

Fixed: versions not sorted correctly in drop down lists....

Jean-Philippe Lang -

r613:29f25601bbe1

parent child

Context file:

r613:29f25601bbe1

Collapse all files

app/views/issues/change_status.rhtml +1 -1

             <h2><%=l(:label_issue)%> #<%= @issue.id %>: <%=h @issue.subject %></h2>
             <%= error_messages_for 'issue' %>
             <% labelled_tabular_form_for(:issue, @issue, :url => {:action => 'change_status', :id => @issue}, :html => {:multipart => true}) do |f| %>
             <%= hidden_field_tag 'confirm', 1 %>
             <%= hidden_field_tag 'new_status_id', @new_status.id %>
             <%= f.hidden_field :lock_version %>
             <div class="box">
             <div class="splitcontentleft">
             <p><label><%=l(:label_issue_status_new)%></label> <%= @new_status.name %></p>
             <p><%= f.select :assigned_to_id, (@issue.project.members.collect {|m| [m.name, m.user_id]}), :include_blank => true %></p>
             <p><%= f.select :done_ratio, ((0..10).to_a.collect {|r| ["#{r*10} %", r*10] }) %></p>
-            <p><%= f.select :fixed_version_id, (@project.versions.collect {|v| [v.name, v.id]}), { :include_blank => true } %></p>
+            <p><%= f.select :fixed_version_id, (@project.versions.sort.collect {|v| [v.name, v.id]}), { :include_blank => true } %></p>
             </div>
             <div class="splitcontentright">
             <% if authorize_for('timelog', 'edit') %>
             <% fields_for :time_entry, @time_entry, { :builder => TabularFormBuilder, :lang => current_language} do |time_entry| %>
             <p><%= time_entry.text_field :hours, :size => 6, :label => :label_spent_time %> <%= l(:field_hours) %></p>
             <p><%= time_entry.text_field :comments, :size => 40 %></p>
             <p><%= time_entry.select :activity_id, (@activities.collect {|p| [p.name, p.id]}) %></p>
             <% end %>
             <% end %>
             </div>
             <div class="clear"></div>
             <p><label for="notes"><%= l(:field_notes) %></label>
             <%= text_area_tag 'notes', @notes, :cols => 60, :rows => 10, :class => 'wiki-edit' %></p>
             <% if authorize_for('issues', 'add_attachment') %>
             <p id="attachments_p"><label><%=l(:label_attachment_new)%>
             <%= image_to_function "add.png", "addFileField();return false" %></label>
             <%= file_field_tag 'attachments[]', :size => 30  %> <em>(<%= l(:label_max_size) %>: <%= number_to_human_size(Setting.attachment_max_size.to_i.kilobytes) %>)</em></p>
             <% end %>
             </div>
             <%= submit_tag l(:button_save) %>
             <% end %>

app/views/issues/edit.rhtml +1 -1

             <h2><%= @issue.tracker.name %> #<%= @issue.id %> - <%=h @issue.subject %></h2>
             <% labelled_tabular_form_for :issue, @issue, :url => {:action => 'edit'} do |f| %>
             <%= error_messages_for 'issue' %>
             <div class="box">
             <!--[form:issue]-->
             <div class="splitcontentleft">
             <p><label><%=l(:field_status)%></label> <%= @issue.status.name %></p>
             <p><%= f.select :priority_id, (@priorities.collect {|p| [p.name, p.id]}), :required => true %></p>
             <p><%= f.select :assigned_to_id, (@issue.project.members.collect {|m| [m.name, m.user_id]}), :include_blank => true %></p>
             <p><%= f.select :category_id, (@project.issue_categories.collect {|c| [c.name, c.id]}), :include_blank => true %></p>
             </div>
             <div class="splitcontentright">
             <p><%= f.text_field :start_date, :size => 10 %><%= calendar_for('issue_start_date') %></p>
             <p><%= f.text_field :due_date, :size => 10 %><%= calendar_for('issue_due_date') %></p>
             <p><%= f.select :done_ratio, ((0..10).to_a.collect {|r| ["#{r*10} %", r*10] }) %></p>
             </div>
             <div class="clear">
             <p><%= f.text_field :subject, :size => 80, :required => true %></p>
             <p><%= f.text_area :description, :required => true, :cols => 60, :rows => [[10, @issue.description.length / 50].max, 100].min, :class => 'wiki-edit' %></p>
             <% for @custom_value in @custom_values %>
             	<p><%= custom_field_tag_with_label @custom_value %></p>
             <% end %>
-            <p><%= f.select :fixed_version_id, (@project.versions.collect {|v| [v.name, v.id]}), { :include_blank => true } %></p>
+            <p><%= f.select :fixed_version_id, (@project.versions.sort.collect {|v| [v.name, v.id]}), { :include_blank => true } %></p>
             </div>
             <!--[eoform:issue]-->
             </div>
             <%= f.hidden_field :lock_version %>
             <%= submit_tag l(:button_save) %>
             <% end %>
             <%= wikitoolbar_for 'issue_description' %>
             <% content_for :header_tags do %>
             <%= javascript_include_tag 'calendar/calendar' %>
             <%= javascript_include_tag "calendar/lang/calendar-#{current_language}.js" %>
             <%= javascript_include_tag 'calendar/calendar-setup' %>
             <%= stylesheet_link_tag 'calendar' %>
             <% end %>

app/views/projects/add_issue.rhtml +1 -1

             <h2><%=l(:label_issue_new)%>: <%= @tracker.name %></h2>
             <% labelled_tabular_form_for :issue, @issue, :url => {:action => 'add_issue'}, :html => {:multipart => true} do |f| %>
             <%= error_messages_for 'issue' %>
             <div class="box">
             <!--[form:issue]-->
             <%= hidden_field_tag 'tracker_id', @tracker.id %>
             <div class="splitcontentleft">
             <p><%= f.select :status_id, (@allowed_statuses.collect {|p| [p.name, p.id]}), :required => true %></p>
             <p><%= f.select :priority_id, (@priorities.collect {|p| [p.name, p.id]}), :required => true %></p>
             <p><%= f.select :assigned_to_id, (@issue.project.members.collect {|m| [m.name, m.user_id]}), :include_blank => true %></p>
             <p><%= f.select :category_id, (@project.issue_categories.collect {|c| [c.name, c.id]}), :include_blank => true %></p>
             </div>
             <div class="splitcontentright">
             <p><%= f.text_field :start_date, :size => 10 %><%= calendar_for('issue_start_date') %></p>
             <p><%= f.text_field :due_date, :size => 10 %><%= calendar_for('issue_due_date') %></p>
             <p><%= f.select :done_ratio, ((0..10).to_a.collect {|r| ["#{r*10} %", r*10] }) %></p>
             </div>
             <div class="clear">
             <p><%= f.text_field :subject, :size => 80, :required => true %></p>
             <p><%= f.text_area :description, :cols => 60, :rows => 10, :required => true, :class => 'wiki-edit' %></p>
             <% for @custom_value in @custom_values %>
             	<p><%= custom_field_tag_with_label @custom_value %></p>
             <% end %>
-            <p><%= f.select :fixed_version_id, (@project.versions.collect {|v| [v.name, v.id]}), { :include_blank => true } %></p>
+            <p><%= f.select :fixed_version_id, (@project.versions.sort.collect {|v| [v.name, v.id]}), { :include_blank => true } %></p>
             <p id="attachments_p"><label for="attachment_file"><%=l(:label_attachment)%>
             <%= image_to_function "add.png", "addFileField();return false" %></label>
             <%= file_field_tag 'attachments[]', :size => 30  %> <em>(<%= l(:label_max_size) %>: <%= number_to_human_size(Setting.attachment_max_size.to_i.kilobytes) %>)</em></p>
             </div>
             <!--[eoform:issue]-->
             </div>
             <%= submit_tag l(:button_create) %>
             <% end %>
             <%= wikitoolbar_for 'issue_description' %>
             <% content_for :header_tags do %>
             <%= javascript_include_tag 'calendar/calendar' %>
             <%= javascript_include_tag "calendar/lang/calendar-#{current_language}.js" %>
             <%= javascript_include_tag 'calendar/calendar-setup' %>
             <%= stylesheet_link_tag 'calendar' %>
             <% 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