| @@ -1111,11 +1111,6 class Query < ActiveRecord::Base | |||
|
|
1111 | 1111 | # Adds a filter for the given custom field |
|
|
1112 | 1112 | def add_custom_field_filter(field, assoc=nil) |
|
|
1113 | 1113 | options = field.query_filter_options(self) |
|
|
1114 | if field.format.target_class && field.format.target_class <= User | |
|
|
1115 | if options[:values].is_a?(Array) && User.current.logged? | |
|
|
1116 | options[:values].unshift ["<< #{l(:label_me)} >>", "me"] | |
|
|
1117 | end | |
|
|
1118 | end | |
|
|
1119 | 1114 | |
|
|
1120 | 1115 | filter_id = "cf_#{field.id}" |
|
|
1121 | 1116 | filter_name = field.name |
| @@ -552,7 +552,7 module Redmine | |||
|
|
552 | 552 | end |
|
|
553 | 553 | |
|
|
554 | 554 | def query_filter_options(custom_field, query) |
|
|
555 | {:type => :list_optional, :values => query_filter_values(custom_field, query)} | |
|
|
555 | {:type => :list_optional, :values => lambda { query_filter_values(custom_field, query) }} | |
|
|
556 | 556 | end |
|
|
557 | 557 | |
|
|
558 | 558 | protected |
| @@ -810,6 +810,10 module Redmine | |||
|
|
810 | 810 | custom_field.user_role.map!(&:to_s).reject!(&:blank?) |
|
|
811 | 811 | end |
|
|
812 | 812 | end |
|
|
813 | ||
|
|
814 | def query_filter_values(*args) | |
|
|
815 | [["<< #{l(:label_me)} >>", "me"]] + super | |
|
|
816 | end | |
|
|
813 | 817 | end |
|
|
814 | 818 | |
|
|
815 | 819 | class VersionFormat < RecordList |
| @@ -83,6 +83,6 class Redmine::VersionFieldFormatTest < ActionView::TestCase | |||
|
|
83 | 83 | query = Query.new(:project => project) |
|
|
84 | 84 | |
|
|
85 | 85 | assert_not_include version.name, field.possible_values_options(project).map(&:first) |
|
|
86 | assert_include version.name, field.query_filter_options(query)[:values].map(&:first) | |
|
|
86 | assert_include version.name, field.query_filter_options(query)[:values].call.map(&:first) | |
|
|
87 | 87 | end |
|
|
88 | 88 | end |
General Comments 0
You need to be logged in to leave comments.
Login now