summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJean-Philippe Lang <jp_lang@yahoo.fr>2012-12-02 21:41:03 +0000
committerJean-Philippe Lang <jp_lang@yahoo.fr>2012-12-02 21:41:03 +0000
commit30787e9cd215e0d2932f0678018081051f95e70c (patch)
treec7fe3cd1f733dfe54660a1fc1fd51be03b1066e0
parent85b5b1c7f007d7d81bd79e8682212b71f84e6ca9 (diff)
downloadredmine-30787e9cd215e0d2932f0678018081051f95e70c.tar.gz
redmine-30787e9cd215e0d2932f0678018081051f95e70c.zip
Preserve the "from" parameter in activity links.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10926 e93f8b46-1217-0410-a6f0-8f06a7374b81
-rw-r--r--app/views/activities/index.html.erb2
1 files changed, 1 insertions, 1 deletions
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? %>