diff options
| author | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2012-12-02 19:16:32 +0000 |
|---|---|---|
| committer | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2012-12-02 19:16:32 +0000 |
| commit | 96fca0b08f6d60e8736e8e3f95a5d0ae33779068 (patch) | |
| tree | c3414fd53dad2b36bab58d898653fb9f53ff6a60 /app | |
| parent | bd10a712177e8b13dd95b6a55ae195c2d33b3ef0 (diff) | |
| download | redmine-96fca0b08f6d60e8736e8e3f95a5d0ae33779068.tar.gz redmine-96fca0b08f6d60e8736e8e3f95a5d0ae33779068.zip | |
Replaces find(:all) calls.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10916 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app')
| -rw-r--r-- | app/controllers/projects_controller.rb | 8 | ||||
| -rw-r--r-- | app/helpers/repositories_helper.rb | 2 | ||||
| -rw-r--r-- | app/helpers/timelog_helper.rb | 2 | ||||
| -rw-r--r-- | app/models/custom_field.rb | 2 |
4 files changed, 8 insertions, 6 deletions
diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb index c8222db73..56b62263c 100644 --- a/app/controllers/projects_controller.rb +++ b/app/controllers/projects_controller.rb @@ -67,14 +67,14 @@ class ProjectsController < ApplicationController end def new - @issue_custom_fields = IssueCustomField.find(:all, :order => "#{CustomField.table_name}.position") + @issue_custom_fields = IssueCustomField.sorted.all @trackers = Tracker.sorted.all @project = Project.new @project.safe_attributes = params[:project] end def create - @issue_custom_fields = IssueCustomField.find(:all, :order => "#{CustomField.table_name}.position") + @issue_custom_fields = IssueCustomField.sorted.all @trackers = Tracker.sorted.all @project = Project.new @project.safe_attributes = params[:project] @@ -107,7 +107,7 @@ class ProjectsController < ApplicationController end def copy - @issue_custom_fields = IssueCustomField.find(:all, :order => "#{CustomField.table_name}.position") + @issue_custom_fields = IssueCustomField.sorted.all @trackers = Tracker.sorted.all @source_project = Project.find(params[:id]) if request.get? @@ -165,7 +165,7 @@ class ProjectsController < ApplicationController end def settings - @issue_custom_fields = IssueCustomField.find(:all, :order => "#{CustomField.table_name}.position") + @issue_custom_fields = IssueCustomField.sorted.all @issue_category ||= IssueCategory.new @member ||= @project.members.new @trackers = Tracker.sorted.all diff --git a/app/helpers/repositories_helper.rb b/app/helpers/repositories_helper.rb index 0238f8e19..c804d33bb 100644 --- a/app/helpers/repositories_helper.rb +++ b/app/helpers/repositories_helper.rb @@ -43,7 +43,7 @@ module RepositoriesHelper end def render_changeset_changes - changes = @changeset.filechanges.find(:all, :limit => 1000, :order => 'path').collect do |change| + changes = @changeset.filechanges.limit(1000).reorder('path').all.collect do |change| case change.action when 'A' # Detects moved/copied files diff --git a/app/helpers/timelog_helper.rb b/app/helpers/timelog_helper.rb index 11a447660..1f70b9bfb 100644 --- a/app/helpers/timelog_helper.rb +++ b/app/helpers/timelog_helper.rb @@ -88,7 +88,7 @@ module TimelogHelper def entries_to_csv(entries) decimal_separator = l(:general_csv_decimal_separator) - custom_fields = TimeEntryCustomField.find(:all) + custom_fields = TimeEntryCustomField.all export = FCSV.generate(:col_sep => l(:general_csv_separator)) do |csv| # csv header fields headers = [l(:field_spent_on), diff --git a/app/models/custom_field.rb b/app/models/custom_field.rb index 22f29d3ac..08c66b57b 100644 --- a/app/models/custom_field.rb +++ b/app/models/custom_field.rb @@ -30,6 +30,8 @@ class CustomField < ActiveRecord::Base validate :validate_custom_field before_validation :set_searchable + scope :sorted, order("#{table_name}.position ASC") + CUSTOM_FIELDS_TABS = [ {:name => 'IssueCustomField', :partial => 'custom_fields/index', :label => :label_issue_plural}, |