Fixes user's activity link (#2853).

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

diff --git a/app/views/account/show.rhtml b/app/views/account/show.rhtml
index 649b4b45c38efc7e5b7e7bbf05decd57232a2cba..6b70c5f865e56c92988c8b3aa3ee50ea17e72e23 100644 (file)
--- a/app/views/account/show.rhtml
+++ b/app/views/account/show.rhtml
@@ -34,7 +34,7 @@
 <div class="splitcontentright">
 
 <% unless @events_by_day.empty? %>
-<h3><%= link_to l(:label_activity), :controller => 'projects', :action => 'activity', :user_id => @user, :from => @events_by_day.keys.first %></h3>
+<h3><%= link_to l(:label_activity), :controller => 'projects', :action => 'activity', :id => nil, :user_id => @user, :from => @events_by_day.keys.first %></h3>
 
 <p>
 <%=l(:label_reported_issues)%>: <%= Issue.count(:conditions => ["author_id=?", @user.id]) %>

diff --git a/config/routes.rb b/config/routes.rb
index d20bc3c9f05053fd89553ad7031a67fb139d3c4e..307a38bd9a7fe9e33172104bdaa5859161da6397 100644 (file)
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -193,8 +193,8 @@ ActionController::Routing::Routes.draw do |map|
     projects.with_options :action => 'activity', :conditions => {:method => :get} do |activity|
       activity.connect 'projects/:id/activity'
       activity.connect 'projects/:id/activity.:format'
-      activity.connect 'activity'
-      activity.connect 'activity.:format'
+      activity.connect 'activity', :id => nil
+      activity.connect 'activity.:format', :id => nil
     end
     
     projects.with_options :conditions => {:method => :post} do |project_actions|