From 317b460d96523c234d2dc2343a9774888c74d44c Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Wed, 29 Aug 2007 17:25:22 +0000
Subject: Some deprecation fixes (end_form_tag and count API).

git-svn-id: http://redmine.rubyforge.org/svn/trunk@676 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/helpers/projects_helper.rb | 8 ++++----
 app/views/account/show.rhtml   | 2 +-
 app/views/roles/report.rhtml   | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'app')

diff --git a/app/helpers/projects_helper.rb b/app/helpers/projects_helper.rb
index da674985b..d3ec69fa7 100644
--- a/app/helpers/projects_helper.rb
+++ b/app/helpers/projects_helper.rb
@@ -178,9 +178,9 @@ module ProjectsHelper
   
   def new_issue_selector
     trackers = Tracker.find(:all, :order => 'position')
-    form_tag({:controller => 'projects', :action => 'add_issue', :id => @project}, :method => :get) +
-      select_tag('tracker_id', '<option></option' + options_from_collection_for_select(trackers, 'id', 'name'),
-        :onchange => "if (this.value != '') {this.form.submit()}") +
-      end_form_tag
+    # can't use form tag inside helper
+    content_tag('form',
+      select_tag('tracker_id', '<option></option' + options_from_collection_for_select(trackers, 'id', 'name'), :onchange => "if (this.value != '') {this.form.submit()}"),
+      :action => url_for(:controller => 'projects', :action => 'add_issue', :id => @project), :method => 'get')
   end
 end
diff --git a/app/views/account/show.rhtml b/app/views/account/show.rhtml
index 4f1bf45e2..97212b377 100644
--- a/app/views/account/show.rhtml
+++ b/app/views/account/show.rhtml
@@ -24,5 +24,5 @@
 
 <h3><%=l(:label_activity)%></h3>
 <p>
-<%=l(:label_reported_issues)%>: <%= Issue.count(["author_id=?", @user.id]) %>
+<%=l(:label_reported_issues)%>: <%= Issue.count(:conditions => ["author_id=?", @user.id]) %>
 </p>
\ No newline at end of file
diff --git a/app/views/roles/report.rhtml b/app/views/roles/report.rhtml
index 676e25f39..ca2f9d798 100644
--- a/app/views/roles/report.rhtml
+++ b/app/views/roles/report.rhtml
@@ -1,6 +1,6 @@
 <h2><%=l(:label_permissions_report)%></h2>
 
-<%= start_form_tag({:action => 'report'}, :id => 'permissions_form') %>
+<% form_tag({:action => 'report'}, :id => 'permissions_form') do %>
 <%= hidden_field_tag 'permissions[0]', '' %>
 <table class="list">
 <thead>
@@ -28,4 +28,4 @@
 </table>
 <p><%= check_all_links 'permissions_form' %></p>
 <p><%= submit_tag l(:button_save) %></p>
-<%= end_form_tag %>
+<% end %>
-- 
cgit v1.2.3