Commit bc93d10b authored by tmaruyama's avatar tmaruyama

split QueriesHelper filters_options_for_select method and add new unit test (#12018)

git-svn-id: https://svn.redmine.org/redmine/trunk@10550 e93f8b46-1217-0410-a6f0-8f06a7374b81
parent d4e40ce6
......@@ -19,11 +19,14 @@
module QueriesHelper
def filters_options_for_select(query)
options_for_select(filters_options(query))
end
def filters_options(query)
options = [[]]
options += query.available_filters.sort {|a,b| a[1][:order] <=> b[1][:order]}.map do |field, field_options|
[field_options[:name], field]
end
options_for_select(options)
end
def column_header(column)
......
# Redmine - project management software
# Copyright (C) 2006-2012 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
# as published by the Free Software Foundation; either version 2
# of the License, or (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
require File.expand_path('../../../test_helper', __FILE__)
class QueriesHelperTest < ActionView::TestCase
include QueriesHelper
fixtures :projects, :enabled_modules, :users, :members,
:member_roles, :roles, :trackers, :issue_statuses,
:issue_categories, :enumerations, :issues,
:watchers, :custom_fields, :custom_values, :versions,
:queries,
:projects_trackers,
:custom_fields_trackers
def test_order
User.current = User.find_by_login('admin')
query = Query.new(:project => nil, :name => '_')
assert_equal 30, query.available_filters.size
fo = filters_options(query)
assert_equal 31, fo.size
assert_equal [], fo[0]
assert_equal "tracker_id", fo[3][1]
assert_equal "priority_id", fo[4][1]
end
end
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment