Nemcio/Redmine
1
0
Fork 0
mirror of https://github.com/redmine/redmine.git synced 2026-03-31 17:50:57 +02:00
Code Issues Packages Projects Releases Activity

Merge r22538 and r22539 from trunk to 5.1-stable (#39894).

Browse Source 
git-svn-id: https://svn.redmine.org/redmine/branches/5.1-stable@22540 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Marius Balteanu
2023-12-21 07:02:33 +00:00
parent 8f3a8c4dba
commit 250d6ea6d4
2 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
app/controllers/watchers_controller.rb
View File

@@ -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

6
test/functional/watchers_controller_test.rb
View File

@@ -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