jro_apps/redmine Commit - r15479:696c51085246

Add support for updating attachments over REST API (#22356)....

Jean-Philippe Lang -

r15479:696c51085246

parent child

Context file:

r15479:696c51085246

Collapse all files

app/controllers/attachments_controller.rb +21 -1

             # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
             class AttachmentsController < ApplicationController
-              before_action :find_attachment, :only => [:show, :download, :thumbnail, :destroy]
+              before_action :find_attachment, :only => [:show, :download, :thumbnail, :update, :destroy]
               before_action :find_editable_attachments, :only => [:edit_all, :update_all]
               before_action :file_readable, :read_authorize, :only => [:show, :download, :thumbnail]
+              before_action :update_authorize, :only => :update
               before_action :delete_authorize, :only => :destroy
               before_action :authorize_global, :only => :upload
                 render :action => 'edit_all'
               end
+              def update
+                @attachment.safe_attributes = params[:attachment]
+                saved = @attachment.save
+                respond_to do |format|
+                  format.api {
+                    if saved
+                      render_api_ok
+                    else
+                      render_validation_errors(@attachment)
+                    end
+                  }
+                end
+              end
               def destroy
                 if @attachment.container.respond_to?(:init_journal)
                   @attachment.container.init_journal(User.current)
                 @attachment.visible? ? true : deny_access
               end
+              def update_authorize
+                @attachment.editable? ? true : deny_access
+              end
               def delete_authorize
                 @attachment.deletable? ? true : deny_access
               end

app/models/attachment.rb +3 0

             require "fileutils"
             class Attachment < ActiveRecord::Base
+              include Redmine::SafeAttributes
               belongs_to :container, :polymorphic => true
               belongs_to :author, :class_name => "User"
               after_rollback :delete_from_disk, :on => :create
               after_commit :delete_from_disk, :on => :destroy
+              safe_attributes 'filename', 'content_type', 'description'
               # Returns an unsaved copy of the attachment
               def copy(attributes=nil)
                 copy = self.class.new

config/routes.rb +1 -1

               get 'attachments/download/:id/:filename', :to => 'attachments#download', :id => /\d+/, :filename => /.*/, :as => 'download_named_attachment'
               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, :destroy]
+              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

test/integration/api_test/api_routing_test.rb +1 0

               def test_attachments
                 should_route 'GET /attachments/1' => 'attachments#show', :id => '1'
+                should_route 'PATCH /attachments/1' => 'attachments#update', :id => '1'
                 should_route 'POST /uploads' => 'attachments#upload'
               end

test/integration/api_test/attachments_test.rb +23 0

@@ -99,6 +99,29 class Redmine::ApiTest::AttachmentsTest < Redmine::ApiTest::Base
99	assert_nil Attachment.find_by_id(7)	99	assert_nil Attachment.find_by_id(7)
100	end	100	end
101		101
		102	test "PATCH /attachments/:id.json should update the attachment" do
		103	patch '/attachments/7.json',
		104	{:attachment => {:filename => 'renamed.zip', :description => 'updated'}},
		105	credentials('jsmith')
		106
		107	assert_response :ok
		108	assert_equal 'application/json', response.content_type
		109	attachment = Attachment.find(7)
		110	assert_equal 'renamed.zip', attachment.filename
		111	assert_equal 'updated', attachment.description
		112	end
		113
		114	test "PATCH /attachments/:id.json with failure should return the errors" do
		115	patch '/attachments/7.json',
		116	{:attachment => {:filename => '', :description => 'updated'}},
		117	credentials('jsmith')
		118
		119	assert_response 422
		120	assert_equal 'application/json', response.content_type
		121	json = ActiveSupport::JSON.decode(response.body)
		122	assert_include "File cannot be blank", json['errors']
		123	end
		124
102	test "POST /uploads.xml should return the token" do	125	test "POST /uploads.xml should return the token" do
103	set_tmp_attachments_directory	126	set_tmp_attachments_directory
104	assert_difference 'Attachment.count' do	127	assert_difference 'Attachment.count' do

test/integration/routing/attachments_test.rb +2 -2

                 should_route 'DELETE /attachments/1' => 'attachments#destroy', :id => '1'
-                should_route 'GET /attachments/issues/1/edit' => 'attachments#edit', :object_type => 'issues', :object_id => '1'
+                should_route 'GET /attachments/issues/1/edit' => 'attachments#edit_all', :object_type => 'issues', :object_id => '1'
-                should_route 'PATCH /attachments/issues/1' => 'attachments#update', :object_type => 'issues', :object_id => '1'
+                should_route 'PATCH /attachments/issues/1' => 'attachments#update_all', :object_type => 'issues', :object_id => '1'
               end
             end

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages