jro_apps/redmine Commit - r11687:e27deb1ecee4

Query#add_custom_fields_filters now takes a custom fields scope....

Jean-Philippe Lang -

r11687:e27deb1ecee4

parent child

Context file:

r11687:e27deb1ecee4

Collapse all files

app/models/issue_query.rb +1 -1

                     principals += Principal.member_of(all_projects)
                   end
                   versions = Version.visible.find_all_by_sharing('system')
-                  issue_custom_fields = IssueCustomField.where(:is_filter => true, :is_for_all => true).all
+                  issue_custom_fields = IssueCustomField.where(:is_for_all => true)
                 end
                 principals.uniq!
                 principals.sort!

app/models/query.rb +13 -6

                 return sql
               end
-              def add_custom_fields_filters(custom_fields, assoc=nil)
+              # Adds a filter for the given custom field
-                return unless custom_fields.present?
+              def add_custom_field_filter(field, assoc=nil)
-                custom_fields.select(&:is_filter?).sort.each do |field|
                 case field.field_format
                 when "text"
                   options = { :type => :text }
                 when "float"
                   options = { :type => :float }
                 when "user", "version"
-                    next unless project
+                  return unless project
                   values = field.possible_values_options(project)
                   if User.current.logged? && field.field_format == 'user'
                     values.unshift ["<< #{l(:label_me)} >>", "me"]
                   :field => field
                 })
               end
+              # Adds filters for the given custom fields scope
+              def add_custom_fields_filters(scope, assoc=nil)
+                scope.where(:is_filter => true).sorted.each do |field|
+                  add_custom_field_filter(field, assoc)
+                end
               end
+              # Adds filters for the given associations custom fields
               def add_associations_custom_fields_filters(*associations)
                 fields_by_class = CustomField.where(:is_filter => true).group_by(&:class)
                 associations.each do |assoc|
                   association_klass = queried_class.reflect_on_association(assoc).klass
                   fields_by_class.each do |field_class, fields|
                     if field_class.customized_class <= association_klass
-                      add_custom_fields_filters(fields, assoc)
+                      fields.sort.each do |field|
+                        add_custom_field_filter(field, assoc)
+                      end
                     end
                   end
                 end

app/models/time_entry_query.rb +1 -1

                 add_available_filter "comments", :type => :text
                 add_available_filter "hours", :type => :float
-                add_custom_fields_filters(TimeEntryCustomField.where(:is_filter => true).all)
+                add_custom_fields_filters(TimeEntryCustomField)
                 add_associations_custom_fields_filters :project, :issue, :user
               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