diff options
| -rw-r--r-- | app/controllers/context_menus_controller.rb | 3 | ||||
| -rw-r--r-- | test/functional/context_menus_controller_test.rb | 5 |
2 files changed, 8 insertions, 0 deletions
diff --git a/app/controllers/context_menus_controller.rb b/app/controllers/context_menus_controller.rb index 553353bc0..bc434ea12 100644 --- a/app/controllers/context_menus_controller.rb +++ b/app/controllers/context_menus_controller.rb @@ -21,6 +21,7 @@ class ContextMenusController < ApplicationController def issues @issues = Issue.visible.all(:conditions => {:id => params[:ids]}, :include => :project) + (render_404; return) unless @issues.present? if (@issues.size == 1) @issue = @issues.first end @@ -74,6 +75,8 @@ class ContextMenusController < ApplicationController def time_entries @time_entries = TimeEntry.all( :conditions => {:id => params[:ids]}, :include => :project) + (render_404; return) unless @time_entries.present? + @projects = @time_entries.collect(&:project).compact.uniq @project = @projects.first if @projects.size == 1 @activities = TimeEntryActivity.shared.active diff --git a/test/functional/context_menus_controller_test.rb b/test/functional/context_menus_controller_test.rb index b3e643510..9039ab00b 100644 --- a/test/functional/context_menus_controller_test.rb +++ b/test/functional/context_menus_controller_test.rb @@ -226,6 +226,11 @@ class ContextMenusControllerTest < ActionController::TestCase assert_equal [1], assigns(:issues).collect(&:id) end + def test_should_respond_with_404_without_ids + get :issues + assert_response 404 + end + def test_time_entries_context_menu @request.session[:user_id] = 2 get :time_entries, :ids => [1, 2] |