User #where instead of :conditions.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@11861 e93f8b46-1217-0410-a6f0-8f06a7374b81

diff --git a/app/views/my/blocks/_issuesassignedtome.html.erb b/app/views/my/blocks/_issuesassignedtome.html.erb
index 41f87ec43fe1ae4208a21ddf10c60eb5c621d7c5..f408111a30afdf24cd0283ff56c2bc2833e4c485 100644 (file)
--- a/app/views/my/blocks/_issuesassignedtome.html.erb
+++ b/app/views/my/blocks/_issuesassignedtome.html.erb
@@ -1,7 +1,7 @@
 <h3>
   <%= link_to l(:label_assigned_to_me_issues),
         issues_path(:set_filter => 1, :assigned_to_id => 'me', :sort => 'priority:desc,updated_on:desc') %>
-  (<%= Issue.visible.open.count(:conditions => {:assigned_to_id => ([User.current.id] + User.current.group_ids)})%>)
+  (<%= Issue.visible.open.where(:assigned_to_id => ([User.current.id] + User.current.group_ids)).count %>)
 </h3>
 
 <% assigned_issues = issuesassignedtome_items %>

diff --git a/app/views/my/blocks/_issuesreportedbyme.html.erb b/app/views/my/blocks/_issuesreportedbyme.html.erb
index 2253af9af5e77b25f66c225b4a03b70c6f3ae61a..3064675f2a12124153622b3d71ada8a6a3472659 100644 (file)
--- a/app/views/my/blocks/_issuesreportedbyme.html.erb
+++ b/app/views/my/blocks/_issuesreportedbyme.html.erb
@@ -1,7 +1,7 @@
 <h3>
   <%= link_to l(:label_reported_issues),
         issues_path(:set_filter => 1, :status_id => '*', :author_id => 'me', :sort => 'updated_on:desc') %>
-  (<%= Issue.visible.count(:conditions => { :author_id => User.current.id }) %>)
+  (<%= Issue.visible.where(:author_id => User.current.id).count %>)
 </h3>
 
 <% reported_issues = issuesreportedbyme_items %>