Skip to content
Snippets Groups Projects
Commit d3386a5a authored by Jean-Philippe Lang's avatar Jean-Philippe Lang
Browse files

Fixed: 404 when "Apply" clicked on activity page (#2251).

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2082 e93f8b46-1217-0410-a6f0-8f06a7374b81
parent 5330ca9b
Branches
Tags
No related merge requests found
...@@ -227,7 +227,7 @@ class ProjectsController < ApplicationController ...@@ -227,7 +227,7 @@ class ProjectsController < ApplicationController
@date_to ||= Date.today + 1 @date_to ||= Date.today + 1
@date_from = @date_to - @days @date_from = @date_to - @days
@with_subprojects = params[:with_subprojects].nil? ? Setting.display_subprojects_issues? : (params[:with_subprojects] == '1') @with_subprojects = params[:with_subprojects].nil? ? Setting.display_subprojects_issues? : (params[:with_subprojects] == '1')
@author = (params[:user_id] ? User.active.find(params[:user_id]) : nil) @author = (params[:user_id].blank? ? nil : User.active.find(params[:user_id]))
@activity = Redmine::Activity::Fetcher.new(User.current, :project => @project, @activity = Redmine::Activity::Fetcher.new(User.current, :project => @project,
:with_subprojects => @with_subprojects, :with_subprojects => @with_subprojects,
......
...@@ -52,7 +52,7 @@ ...@@ -52,7 +52,7 @@
<p><label><%= check_box_tag 'with_subprojects', 1, @with_subprojects %> <%=l(:label_subproject_plural)%></label></p> <p><label><%= check_box_tag 'with_subprojects', 1, @with_subprojects %> <%=l(:label_subproject_plural)%></label></p>
<%= hidden_field_tag 'with_subprojects', 0 %> <%= hidden_field_tag 'with_subprojects', 0 %>
<% end %> <% end %>
<%= hidden_field_tag 'user_id', params[:user_id] %> <%= hidden_field_tag('user_id', params[:user_id]) unless params[:user_id].blank? %>
<p><%= submit_tag l(:button_apply), :class => 'button-small', :name => nil %></p> <p><%= submit_tag l(:button_apply), :class => 'button-small', :name => nil %></p>
<% end %> <% end %>
<% end %> <% end %>
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment