kolan
/
Redmine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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
This commit is contained in:
Jean-Philippe Lang 2012-05-21 16:55:48 +00:00
parent ae8830ed61
commit 1ab9e42b9b
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/views/queries/_form.html.erb
View File

@ -44,7 +44,7 @@
<% end %> <% end %>
</fieldset> </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> <legend><%= l(:field_column_names) %></legend>
<%= render :partial => 'queries/columns', :locals => {:query => query}%> <%= render :partial => 'queries/columns', :locals => {:query => query}%>
<% end %> <% end %>

4
test/functional/queries_controller_test.rb
View File

@ -36,6 +36,10 @@ class QueriesControllerTest < ActionController::TestCase
:name => 'query_is_for_all', :name => 'query_is_for_all',
:checked => nil, :checked => nil,
:disabled => nil } :disabled => nil }
assert_select 'select[name=?]', 'c[]' do
assert_select 'option[value=tracker]'
assert_select 'option[value=subject]'
end
end end
def test_new_global_query def test_new_global_query