diff options
| author | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2014-12-26 11:26:24 +0000 |
|---|---|---|
| committer | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2014-12-26 11:26:24 +0000 |
| commit | 12890945e527c2803ad5a85ca4afbe1017c34025 (patch) | |
| tree | 92d49a3a9ec3d13eb520d2b2ee354e55c374f773 /app | |
| parent | 0e58ee44ebec53a3ed3319f50b2808b4b48c96b3 (diff) | |
| download | redmine-12890945e527c2803ad5a85ca4afbe1017c34025.tar.gz redmine-12890945e527c2803ad5a85ca4afbe1017c34025.zip | |
Allow attachment thumbnails from REST API (#18707).
git-svn-id: http://svn.redmine.org/redmine/trunk@13806 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app')
| -rw-r--r-- | app/controllers/attachments_controller.rb | 2 | ||||
| -rw-r--r-- | app/helpers/attachments_helper.rb | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/app/controllers/attachments_controller.rb b/app/controllers/attachments_controller.rb index d9357fbbd..e622d8086 100644 --- a/app/controllers/attachments_controller.rb +++ b/app/controllers/attachments_controller.rb @@ -22,7 +22,7 @@ class AttachmentsController < ApplicationController before_filter :delete_authorize, :only => :destroy before_filter :authorize_global, :only => :upload - accept_api_auth :show, :download, :upload + accept_api_auth :show, :download, :thumbnail, :upload def show respond_to do |format| diff --git a/app/helpers/attachments_helper.rb b/app/helpers/attachments_helper.rb index 387ed99d7..ed362e2e8 100644 --- a/app/helpers/attachments_helper.rb +++ b/app/helpers/attachments_helper.rb @@ -54,6 +54,10 @@ module AttachmentsHelper api.content_type attachment.content_type api.description attachment.description api.content_url download_named_attachment_url(attachment, attachment.filename) + if attachment.thumbnailable? + api.thumbnail_url thumbnail_url(attachment) + end + api.content_url download_named_attachment_url(attachment, attachment.filename) api.author(:id => attachment.author.id, :name => attachment.author.name) if attachment.author api.created_on attachment.created_on end |