meineerde/redmine
1
0
Fork 0
mirror of https://github.com/meineerde/redmine.git synced 2026-03-10 19:23:06 +00:00
Code Issues Releases Wiki Activity

Merged r21906 from trunk to 5.0-stable (#37772).

Browse Source 
git-svn-id: https://svn.redmine.org/redmine/branches/5.0-stable@21909 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Go MAEDA 2022-10-20 04:33:11 +00:00
parent c02e3bfaec
commit eea816ae08
2 changed files with 5 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
config/routes.rb
View File

@ -312,9 +312,11 @@ Rails.application.routes.draw do
get 'attachments/download/:id', :to => 'attachments#download', :id => /\d+/
get 'attachments/thumbnail/:id(/:size)', :to => 'attachments#thumbnail', :id => /\d+/, :size => /\d+/, :as => 'thumbnail'
resources :attachments, :only => [:show, :update, :destroy]
get 'attachments/:object_type/:object_id/edit', :to => 'attachments#edit_all', :as => :object_attachments_edit
patch 'attachments/:object_type/:object_id', :to => 'attachments#update_all', :as => :object_attachments
get 'attachments/:object_type/:object_id/download', :to => 'attachments#download_all', :as => :object_attachments_download
constraints object_type: /(issues|versions|news|messages|wiki_pages|projects|documents|journals)/ do
get 'attachments/:object_type/:object_id/edit', :to => 'attachments#edit_all', :as => :object_attachments_edit
patch 'attachments/:object_type/:object_id', :to => 'attachments#update_all', :as => :object_attachments
get 'attachments/:object_type/:object_id/download', :to => 'attachments#download_all', :as => :object_attachments_download
end
resources :groups do
resources :memberships, :controller => 'principal_memberships'

11
test/functional/attachments_controller_test.rb
View File

@ -491,17 +491,6 @@ class AttachmentsControllerTest < Redmine::ControllerTest
assert_select 'h2 a', :text => "Feature request #2"
end
def test_edit_all_with_invalid_container_class_should_return_404
get(
:edit_all,
:params => {
:object_type => 'nuggets',
:object_id => '3'
}
)
assert_response 404
end
def test_edit_all_with_invalid_object_should_return_404
get(
:edit_all,