diff options
| author | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2009-02-27 12:08:52 +0000 |
|---|---|---|
| committer | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2009-02-27 12:08:52 +0000 |
| commit | 9fe6bcac7436e073f11cd6612e7d134b5e2e17e0 (patch) | |
| tree | 68fdeaa24c483f0d2cfbc09ec1cb9cfd40166c2c | |
| parent | 4d892fd6d003ca75d1e5c3009002df7a108f55c1 (diff) | |
| download | redmine-9fe6bcac7436e073f11cd6612e7d134b5e2e17e0.tar.gz redmine-9fe6bcac7436e073f11cd6612e7d134b5e2e17e0.zip | |
Fixes user's activity link (#2853).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2532 e93f8b46-1217-0410-a6f0-8f06a7374b81
| -rw-r--r-- | app/views/account/show.rhtml | 2 | ||||
| -rw-r--r-- | config/routes.rb | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/app/views/account/show.rhtml b/app/views/account/show.rhtml index 649b4b45c..6b70c5f86 100644 --- 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 d20bc3c9f..307a38bd9 100644 --- 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| |