diff options
| author | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2012-05-21 16:55:48 +0000 |
|---|---|---|
| committer | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2012-05-21 16:55:48 +0000 |
| commit | 1ab9e42b9be7c46c97ad77fa275c919928d183b8 (patch) | |
| tree | 94e5c7d1d0c1d34de6b2343732b7837451b93754 | |
| parent | ae8830ed618401aea7a9ae270a88d11ab11e0bdb (diff) | |
| download | redmine-1ab9e42b9be7c46c97ad77fa275c919928d183b8.tar.gz redmine-1ab9e42b9be7c46c97ad77fa275c919928d183b8.zip | |
Fixed that columns selection in not displayed on the custom query form (#10972).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9702 e93f8b46-1217-0410-a6f0-8f06a7374b81
| -rw-r--r-- | app/views/queries/_form.html.erb | 2 | ||||
| -rw-r--r-- | test/functional/queries_controller_test.rb | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/app/views/queries/_form.html.erb b/app/views/queries/_form.html.erb index cee8fbaa8..ba8c58070 100644 --- a/app/views/queries/_form.html.erb +++ b/app/views/queries/_form.html.erb @@ -44,7 +44,7 @@ <% end %> </fieldset> -<% content_tag 'fieldset', :id => 'columns', :style => (query.has_default_columns? ? 'display:none;' : nil) do %> +<%= content_tag 'fieldset', :id => 'columns', :style => (query.has_default_columns? ? 'display:none;' : nil) do %> <legend><%= l(:field_column_names) %></legend> <%= render :partial => 'queries/columns', :locals => {:query => query}%> <% end %> diff --git a/test/functional/queries_controller_test.rb b/test/functional/queries_controller_test.rb index b9e4f417c..7cd823e6f 100644 --- a/test/functional/queries_controller_test.rb +++ b/test/functional/queries_controller_test.rb @@ -36,6 +36,10 @@ class QueriesControllerTest < ActionController::TestCase :name => 'query_is_for_all', :checked => nil, :disabled => nil } + assert_select 'select[name=?]', 'c[]' do + assert_select 'option[value=tracker]' + assert_select 'option[value=subject]' + end end def test_new_global_query |