From d18f4d4b92ee3c41d5fd0886bfe8483427ce5143 Mon Sep 17 00:00:00 2001 From: Marius Balteanu Date: Thu, 21 Dec 2023 07:02:53 +0000 Subject: [PATCH] Merge r22538 and r22539 from trunk to 5.0-stable (#39894). git-svn-id: https://svn.redmine.org/redmine/branches/5.0-stable@22541 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- app/controllers/watchers_controller.rb | 7 ++++++- test/functional/watchers_controller_test.rb | 6 ++++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/app/controllers/watchers_controller.rb b/app/controllers/watchers_controller.rb index 58c875b0c..dbacb5c76 100644 --- a/app/controllers/watchers_controller.rb +++ b/app/controllers/watchers_controller.rb @@ -32,7 +32,12 @@ class WatchersController < ApplicationController accept_api_auth :create, :destroy def new - @users = users_for_new_watcher + respond_to do |format| + format.html { render_404 } + format.js do + @users = users_for_new_watcher + end + end end def create diff --git a/test/functional/watchers_controller_test.rb b/test/functional/watchers_controller_test.rb index 38d0039d7..bc0b591ef 100644 --- a/test/functional/watchers_controller_test.rb +++ b/test/functional/watchers_controller_test.rb @@ -156,6 +156,12 @@ class WatchersControllerTest < Redmine::ControllerTest assert_match /ajax-modal/, response.body end + def test_new_as_html_should_respond_with_404 + @request.session[:user_id] = 2 + get :new, :params => {:object_type => 'issue', :object_id => '2'} + assert_response 404 + end + def test_new_for_message @request.session[:user_id] = 2 get :new, :params => {:object_type => 'message', :object_id => '1'}, :xhr => true -- 2.39.5