| @@ -196,10 +196,10 class Query < ActiveRecord::Base | |||
|
|
196 | 196 | @available_filters["assigned_to_id"] = { :type => :list_optional, :order => 4, :values => user_values } unless user_values.empty? |
|
|
197 | 197 | @available_filters["author_id"] = { :type => :list, :order => 5, :values => user_values } unless user_values.empty? |
|
|
198 | 198 | |
|
|
199 | group_values = Group.all.collect {|g| [g.name, g.id] } | |
|
|
199 | group_values = Group.all.collect {|g| [g.name, g.id.to_s] } | |
|
|
200 | 200 | @available_filters["member_of_group"] = { :type => :list_optional, :order => 6, :values => group_values } unless group_values.empty? |
|
|
201 | 201 | |
|
|
202 | role_values = Role.givable.collect {|r| [r.name, r.id] } | |
|
|
202 | role_values = Role.givable.collect {|r| [r.name, r.id.to_s] } | |
|
|
203 | 203 | @available_filters["assigned_to_role"] = { :type => :list_optional, :order => 7, :values => role_values } unless role_values.empty? |
|
|
204 | 204 | |
|
|
205 | 205 | if User.current.logged? |
| @@ -397,8 +397,8 class QueryTest < ActiveSupport::TestCase | |||
|
|
397 | 397 | group2 = Group.generate!.reload |
|
|
398 | 398 | |
|
|
399 | 399 | expected_group_list = [ |
|
|
400 | [group1.name, group1.id], | |
|
|
401 | [group2.name, group2.id] | |
|
|
400 | [group1.name, group1.id.to_s], | |
|
|
401 | [group2.name, group2.id.to_s] | |
|
|
402 | 402 | ] |
|
|
403 | 403 | assert_equal expected_group_list.sort, @query.available_filters["member_of_group"][:values].sort |
|
|
404 | 404 | end |
| @@ -415,14 +415,14 class QueryTest < ActiveSupport::TestCase | |||
|
|
415 | 415 | end |
|
|
416 | 416 | |
|
|
417 | 417 | should "have a list of the Roles as values" do |
|
|
418 | assert @query.available_filters["assigned_to_role"][:values].include?(['Manager',1]) | |
|
|
419 | assert @query.available_filters["assigned_to_role"][:values].include?(['Developer',2]) | |
|
|
420 | assert @query.available_filters["assigned_to_role"][:values].include?(['Reporter',3]) | |
|
|
418 | assert @query.available_filters["assigned_to_role"][:values].include?(['Manager','1']) | |
|
|
419 | assert @query.available_filters["assigned_to_role"][:values].include?(['Developer','2']) | |
|
|
420 | assert @query.available_filters["assigned_to_role"][:values].include?(['Reporter','3']) | |
|
|
421 | 421 | end |
|
|
422 | 422 | |
|
|
423 | 423 | should "not include the built in Roles as values" do |
|
|
424 | assert ! @query.available_filters["assigned_to_role"][:values].include?(['Non member',4]) | |
|
|
425 | assert ! @query.available_filters["assigned_to_role"][:values].include?(['Anonymous',5]) | |
|
|
424 | assert ! @query.available_filters["assigned_to_role"][:values].include?(['Non member','4']) | |
|
|
425 | assert ! @query.available_filters["assigned_to_role"][:values].include?(['Anonymous','5']) | |
|
|
426 | 426 | end |
|
|
427 | 427 | |
|
|
428 | 428 | end |
General Comments 0
You need to be logged in to leave comments.
Login now