Nemcio/Redmine
1
0
Fork 0
mirror of https://github.com/redmine/redmine.git synced 2026-01-26 17:30:00 +01:00
Code Issues Packages Projects Releases Activity

Merged r9702 from trunk.

Browse Source 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.0-stable@9705 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Jean-Philippe Lang
2012-05-21 18:59:31 +00:00
parent 7cd7b1bd8b
commit 821ea2a757
2 changed files with 5 additions and 1 deletions
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 %>
</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 %>

4
test/functional/queries_controller_test.rb
View File

@@ -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