diff options
| author | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2012-04-25 17:17:49 +0000 |
|---|---|---|
| committer | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2012-04-25 17:17:49 +0000 |
| commit | 5e57a1a9d9478162ac4f27ae96b2ccaf55a1aba7 (patch) | |
| tree | 93e57765139714bd82dede475725516c448c0d55 /app/views/queries | |
| parent | 34e20c4373b7f5a20ab3a132feae3f70f21ec477 (diff) | |
| download | redmine-5e57a1a9d9478162ac4f27ae96b2ccaf55a1aba7.tar.gz redmine-5e57a1a9d9478162ac4f27ae96b2ccaf55a1aba7.zip | |
Merged rails-3.2 branch.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9528 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app/views/queries')
| -rw-r--r-- | app/views/queries/_filters.html.erb | 2 | ||||
| -rw-r--r-- | app/views/queries/edit.html.erb | 2 | ||||
| -rw-r--r-- | app/views/queries/new.html.erb | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/app/views/queries/_filters.html.erb b/app/views/queries/_filters.html.erb index ff84d8544..5bc6af2f3 100644 --- a/app/views/queries/_filters.html.erb +++ b/app/views/queries/_filters.html.erb @@ -5,7 +5,7 @@ <% query.available_filters.sort{|a,b| a[1][:order]<=>b[1][:order]}.each do |filter| %> <% field = filter[0] options = filter[1] %> - <tr <%= 'style="display:none;"' unless query.has_filter?(field) %> id="tr_<%= field %>" class="filter"> + <tr <%= 'style="display:none;"'.html_safe unless query.has_filter?(field) %> id="tr_<%= field %>" class="filter"> <td class="field"> <%= check_box_tag 'f[]', field, query.has_filter?(field), :onclick => "toggle_filter('#{field}');", :id => "cb_#{field}" %> <label for="cb_<%= field %>"><%= filter[1][:name] || l(("field_"+field.to_s.gsub(/\_id$/, "")).to_sym) %></label> diff --git a/app/views/queries/edit.html.erb b/app/views/queries/edit.html.erb index 610ae01c3..a1534f82d 100644 --- a/app/views/queries/edit.html.erb +++ b/app/views/queries/edit.html.erb @@ -1,6 +1,6 @@ <h2><%= l(:label_query) %></h2> -<% form_tag(query_path(@query), :onsubmit => 'selectAllOptions("selected_columns");', :method => :put) do %> +<%= form_tag(query_path(@query), :onsubmit => 'selectAllOptions("selected_columns");', :method => :put) do %> <%= render :partial => 'form', :locals => {:query => @query} %> <%= submit_tag l(:button_save) %> <% end %> diff --git a/app/views/queries/new.html.erb b/app/views/queries/new.html.erb index 2ec7f6600..7081eee24 100644 --- a/app/views/queries/new.html.erb +++ b/app/views/queries/new.html.erb @@ -1,6 +1,6 @@ <h2><%= l(:label_query_new) %></h2> -<% form_tag(@project ? project_queries_path : queries_path, :onsubmit => 'selectAllOptions("selected_columns");') do %> +<%= form_tag(@project ? project_queries_path(@project) : queries_path, :onsubmit => 'selectAllOptions("selected_columns");') do %> <%= render :partial => 'form', :locals => {:query => @query} %> <%= submit_tag l(:button_save) %> <% end %> |