meineerde/redmine
1
0
Fork 0
mirror of https://github.com/meineerde/redmine.git synced 2025-12-19 15:01:14 +00:00
Code Issues Releases Wiki Activity

Use sorted instead of sort (#29406).

Browse Source 
Patch by Pavel Rosický.


git-svn-id: http://svn.redmine.org/redmine/trunk@17685 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Go MAEDA 2018-12-02 22:31:44 +00:00
parent 7de281e904
commit 21d5bb33a2
4 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/files_controller.rb
View File

@ -44,7 +44,7 @@ class FilesController < ApplicationController
end end
def new def new
@versions = @project.versions.sort @versions = @project.versions.sorted
end end
def create def create

2
app/controllers/projects_controller.rb
View File

@ -176,7 +176,7 @@ class ProjectsController < ApplicationController
@version_status = params[:version_status] || 'open' @version_status = params[:version_status] || 'open'
@version_name = params[:version_name] @version_name = params[:version_name]
@versions = @project.shared_versions.status(@version_status).like(@version_name) @versions = @project.shared_versions.status(@version_status).like(@version_name).sorted
end end
def edit def edit

12
app/controllers/reports_controller.rb
View File

@ -21,11 +21,11 @@ class ReportsController < ApplicationController
def issue_report def issue_report
@trackers = @project.rolled_up_trackers(false).visible @trackers = @project.rolled_up_trackers(false).visible
@versions = @project.shared_versions.sort @versions = @project.shared_versions.sorted
@priorities = IssuePriority.all.reverse @priorities = IssuePriority.all.reverse
@categories = @project.issue_categories @categories = @project.issue_categories
@assignees = (Setting.issue_group_assignment? ? @project.principals : @project.users).sort @assignees = (Setting.issue_group_assignment? ? @project.principals : @project.users).sorted
@authors = @project.users.sort @authors = @project.users.sorted
@subprojects = @project.descendants.visible @subprojects = @project.descendants.visible
with_subprojects = Setting.display_subprojects_issues? with_subprojects = Setting.display_subprojects_issues?
@issues_by_tracker = Issue.by_tracker(@project, with_subprojects) @issues_by_tracker = Issue.by_tracker(@project, with_subprojects)
@ -49,7 +49,7 @@ class ReportsController < ApplicationController
@report_title = l(:field_tracker) @report_title = l(:field_tracker)
when "version" when "version"
@field = "fixed_version_id" @field = "fixed_version_id"
@rows = @project.shared_versions.sort @rows = @project.shared_versions.sorted
@data = Issue.by_version(@project, with_subprojects) @data = Issue.by_version(@project, with_subprojects)
@report_title = l(:field_version) @report_title = l(:field_version)
when "priority" when "priority"
@ -64,12 +64,12 @@ class ReportsController < ApplicationController
@report_title = l(:field_category) @report_title = l(:field_category)
when "assigned_to" when "assigned_to"
@field = "assigned_to_id" @field = "assigned_to_id"
@rows = (Setting.issue_group_assignment? ? @project.principals : @project.users).sort @rows = (Setting.issue_group_assignment? ? @project.principals : @project.users).sorted
@data = Issue.by_assigned_to(@project, with_subprojects) @data = Issue.by_assigned_to(@project, with_subprojects)
@report_title = l(:field_assigned_to) @report_title = l(:field_assigned_to)
when "author" when "author"
@field = "author_id" @field = "author_id"
@rows = @project.users.sort @rows = @project.users.sorted
@data = Issue.by_author(@project, with_subprojects) @data = Issue.by_author(@project, with_subprojects)
@report_title = l(:field_author) @report_title = l(:field_author)
when "subproject" when "subproject"

2
app/views/projects/settings/_versions.html.erb
View File

@ -32,7 +32,7 @@
<th style="width:15%"></th> <th style="width:15%"></th>
</tr></thead> </tr></thead>
<tbody> <tbody>
<% @versions.sort.each do |version| %> <% @versions.each do |version| %>
<tr class="version <%=h version.status %> <%= 'shared' if version.project != @project %>"> <tr class="version <%=h version.status %> <%= 'shared' if version.project != @project %>">
<td class="name <%= 'icon icon-shared' if version.project != @project %>"><%= link_to_version version %></td> <td class="name <%= 'icon icon-shared' if version.project != @project %>"><%= link_to_version version %></td>
<td class="tick"><%= checked_image(version.id == @project.default_version_id) %></td> <td class="tick"><%= checked_image(version.id == @project.default_version_id) %></td>