Skip to content

Commit f86abae

Browse files
oliverguentheroliverguenther
committed
Enforce Arel.sql for string order, pluck
1 parent 79befe9 commit f86abae

75 files changed

Lines changed: 116 additions & 113 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎app/controllers/application_controller.rb‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -409,7 +409,7 @@ def self.model_object(model, options = {})
409409
def find_work_packages
410410
@work_packages = WorkPackage.includes(:project)
411411
.where(id: params[:work_package_id] || params[:ids])
412-
.order('id ASC')
412+
.order(Arel.sql('id ASC'))
413413
fail ActiveRecord::RecordNotFound if @work_packages.empty?
414414
@projects = @work_packages.map(&:project).compact.uniq
415415
@project = @projects.first if @projects.size == 1

‎app/controllers/groups_controller.rb‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ class GroupsController < ApplicationController
3838
# GET /groups
3939
# GET /groups.xml
4040
def index
41-
@groups = Group.order('lastname ASC')
41+
@groups = Group.order(Arel.sql('lastname ASC'))
4242

4343
respond_to do |format|
4444
format.html # index.html.erb

‎app/controllers/roles_controller.rb‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ class RolesController < ApplicationController
3636

3737
def index
3838
@roles = Role
39-
.order('builtin, position')
39+
.order(Arel.sql('builtin, position'))
4040
.page(page_param)
4141
.per_page(per_page_param)
4242

@@ -48,7 +48,7 @@ def new
4848
@role = Role.new(permitted_params.role? || { permissions: Role.non_member.permissions })
4949

5050
@permissions = @role.setable_permissions
51-
@roles = Role.order('builtin, position')
51+
@roles = Role.order(Arel.sql('builtin, position'))
5252
end
5353

5454
def create
@@ -63,7 +63,7 @@ def create
6363
notify_changed_roles(:added, @role)
6464
else
6565
@permissions = @role.setable_permissions
66-
@roles = Role.order('builtin, position')
66+
@roles = Role.order(Arel.sql('builtin, position'))
6767

6868
render action: 'new'
6969
end
@@ -99,12 +99,12 @@ def destroy
9999
end
100100

101101
def report
102-
@roles = Role.order('builtin, position')
102+
@roles = Role.order(Arel.sql('builtin, position'))
103103
@permissions = Redmine::AccessControl.permissions.select { |p| !p.public? }
104104
end
105105

106106
def bulk_update
107-
@roles = Role.order('builtin, position')
107+
@roles = Role.order(Arel.sql('builtin, position'))
108108

109109
@roles.each do |role|
110110
new_permissions = params[:permissions][role.id.to_s].presence || []

‎app/controllers/sys_controller.rb‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ def projects
3939
p = Project.active.has_module(:repository)
4040
.includes(:repository)
4141
.references(:repositories)
42-
.order('identifier')
42+
.order(Arel.sql('identifier'))
4343
respond_to do |format|
4444
format.json do
4545
render json: p.to_json(include: :repository)

‎app/controllers/types_controller.rb‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ def permitted_type_params
137137
end
138138

139139
def load_projects_and_types
140-
@types = ::Type.order('position')
140+
@types = ::Type.order(Arel.sql('position'))
141141
@projects = Project.all
142142
end
143143

‎app/controllers/versions_controller.rb‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ class VersionsController < ApplicationController
3636
before_action :authorize
3737

3838
def index
39-
@types = @project.types.order('position')
39+
@types = @project.types.order(Arel.sql('position'))
4040
retrieve_selected_type_ids(@types, @types.select(&:is_in_roadmap?))
4141
@with_subprojects = params[:with_subprojects].nil? ? Setting.display_subprojects_work_packages? : (params[:with_subprojects].to_i == 1)
4242
project_ids = @with_subprojects ? @project.self_and_descendants.map(&:id) : [@project.id]

‎app/controllers/wiki_controller.rb‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -266,7 +266,7 @@ def history
266266
.content
267267
.versions
268268
.select(:id, :user_id, :notes, :created_at, :version)
269-
.order('version DESC')
269+
.order(Arel.sql('version DESC'))
270270
.page(params[:page])
271271
.per_page(per_page_param)
272272

@@ -332,7 +332,7 @@ def destroy
332332
# Export wiki to a single html file
333333
def export
334334
if User.current.allowed_to?(:export_wiki_pages, @project)
335-
@pages = @wiki.pages.order('title')
335+
@pages = @wiki.pages.order(Arel.sql('title'))
336336
export = render_to_string action: 'export_multiple', layout: false
337337
send_data(export, type: 'text/html', filename: 'wiki.html')
338338
else
@@ -418,7 +418,7 @@ def editable?(page = @page)
418418
end
419419

420420
def load_pages_for_index
421-
@pages = @wiki.pages.with_updated_on.order('title').includes(wiki: :project)
421+
@pages = @wiki.pages.with_updated_on.order(Arel.sql('title')).includes(wiki: :project)
422422
end
423423

424424
def default_breadcrumb

‎app/controllers/workflows_controller.rb‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -116,10 +116,10 @@ def show_local_breadcrumb
116116
private
117117

118118
def find_roles
119-
@roles = Role.order('builtin, position')
119+
@roles = Role.order(Arel.sql('builtin, position'))
120120
end
121121

122122
def find_types
123-
@types = ::Type.order('position')
123+
@types = ::Type.order(Arel.sql('position'))
124124
end
125125
end

‎app/helpers/repositories_helper.rb‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ def render_properties(properties)
6363
end
6464

6565
def render_changeset_changes
66-
changes = @changeset.file_changes.limit(1000).order('path').map { |change|
66+
changes = @changeset.file_changes.limit(1000).order(Arel.sql('path')).map { |change|
6767
case change.action
6868
when 'A'
6969
# Detects moved/copied files

‎app/helpers/work_packages_helper.rb‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,7 @@ def work_package_quick_info(work_package, only_path: true)
155155
changed_dates = {}
156156

157157
journals = work_package.journals.where(['created_at >= ?', Date.today.to_time - 7.day])
158-
.order('created_at desc')
158+
.order(Arel.sql('created_at desc'))
159159

160160
journals.each do |journal|
161161
break if changed_dates['start_date'] && changed_dates['due_date']

0 commit comments

Comments
 (0)