diff options
| author | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2008-12-01 17:27:44 +0000 |
|---|---|---|
| committer | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2008-12-01 17:27:44 +0000 |
| commit | d3386a5af784945f70e2c6d95e95e79946754a22 (patch) | |
| tree | cce51aa5b56a48abe09590b4f1fd653a3bf7192c | |
| parent | 5330ca9b8cb643128ea492e075e977bd8af9522b (diff) | |
| download | redmine-d3386a5af784945f70e2c6d95e95e79946754a22.tar.gz redmine-d3386a5af784945f70e2c6d95e95e79946754a22.zip | |
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
| -rw-r--r-- | app/controllers/projects_controller.rb | 2 | ||||
| -rw-r--r-- | app/views/projects/activity.rhtml | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb index 9b3316682..427165a3d 100644 --- a/app/controllers/projects_controller.rb +++ b/app/controllers/projects_controller.rb @@ -227,7 +227,7 @@ class ProjectsController < ApplicationController @date_to ||= Date.today + 1 @date_from = @date_to - @days @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, :with_subprojects => @with_subprojects, diff --git a/app/views/projects/activity.rhtml b/app/views/projects/activity.rhtml index 784a5ac39..b0e536690 100644 --- a/app/views/projects/activity.rhtml +++ b/app/views/projects/activity.rhtml @@ -52,7 +52,7 @@ <p><label><%= check_box_tag 'with_subprojects', 1, @with_subprojects %> <%=l(:label_subproject_plural)%></label></p> <%= hidden_field_tag 'with_subprojects', 0 %> <% 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> <% end %> <% end %> |