From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Sun, 2 Dec 2012 21:41:03 +0000 (+0000)
Subject: Preserve the "from" parameter in activity links.
X-Git-Tag: 2.3.0~505
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=30787e9cd215e0d2932f0678018081051f95e70c;p=redmine.git

Preserve the "from" parameter in activity links.

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

diff --git a/app/views/activities/index.html.erb b/app/views/activities/index.html.erb
index 260e9d2f9..bb129477b 100644
--- a/app/views/activities/index.html.erb
+++ b/app/views/activities/index.html.erb
@@ -44,7 +44,7 @@
 <h3><%= l(:label_activity) %></h3>
 <p><% @activity.event_types.each do |t| %>
 <%= check_box_tag "show_#{t}", 1, @activity.scope.include?(t) %>
-<label for="show_<%=t%>"><%= link_to(l("label_#{t.singularize}_plural"), {"show_#{t}" => 1, :user_id => params[:user_id]})%></label>
+<label for="show_<%=t%>"><%= link_to(l("label_#{t.singularize}_plural"), {"show_#{t}" => 1, :user_id => params[:user_id], :from => params[:from]})%></label>
 <br />
 <% end %></p>
 <% if @project && @project.descendants.active.any? %>