redmine_plugins/redmine_dmsf
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

REST API document download not working #768

Browse Source
This commit is contained in:
Karel Picman 2017-09-14 12:19:47 +02:00
parent 160d0d805e
commit 0f373b5c0c
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/dmsf_files_controller.rb
View File

@ -30,7 +30,7 @@ class DmsfFilesController < ApplicationController
before_action :tree_view, :only => [:delete]
before_action :permissions
accept_api_auth :show
accept_api_auth :show, :view
helper :all
helper :dmsf_workflows

2
app/views/dmsf_files/show.api.rsb
View File

@ -10,5 +10,5 @@ api.dmsf_file do
api.size @file.last_revision.size
api.description @file.last_revision.description
end
api.content_url url_for(:controller => :dmsf_files, :action => 'show', :download => '', :id => @file)
api.content_url download_dmsf_file_url(@file)
end

2
config/routes.rb
View File

@ -81,7 +81,7 @@ if Redmine::Plugin.installed? :redmine_dmsf
post '/dmsf/files/:id/delete', :controller => 'dmsf_files', :action => 'delete', :as => 'delete_dmsf_files'
post '/dmsf/files/:id/revision/create', :controller => 'dmsf_files', :action => 'create_revision'
get '/dmsf/files/:id/revision/delete', :controller => 'dmsf_files', :action => 'delete_revision', :as => 'delete_revision'
get '/dmsf/files/:id/download', :controller => 'dmsf_files', :action => 'show', :download => '' # Otherwise will not route nil download param
get '/dmsf/files/:id/download', :to => 'dmsf_files#view', :download => '', :as => 'download_dmsf_file' # Otherwise will not route nil into the download param
get '/dmsf/files/:id/view', :to => 'dmsf_files#view', :as => 'view_dmsf_file'
get '/dmsf/files/:id', :controller => 'dmsf_files', :action => 'show', :as => 'dmsf_file'
delete '/dmsf/files/:id', :controller => 'dmsf_files', :action => 'delete'

4
test/integration/rest_api/dmsf_file_api_test.rb
View File

@ -70,7 +70,7 @@ class DmsfFileApiTest < RedmineDmsf::Test::IntegrationTest
# <digest>81dc9bdb52d04dc20036dbd8313ed055</digest>
# <size>4</size>
# <description>Some file :-)</description>
# <content_url>/dmsf/files/1/download</content_url>
# <content_url>http://www.example.com/dmsf/files/1/download</content_url>
# </dmsf_file>
assert_select 'dmsf_file > id', :text => @file1.id.to_s
assert_select 'dmsf_file > name', :text => @file1.name
@ -80,7 +80,7 @@ class DmsfFileApiTest < RedmineDmsf::Test::IntegrationTest
assert_select 'dmsf_file > digest', :text => @file1.last_revision.digest
assert_select 'dmsf_file > size', :text => @file1.last_revision.size.to_s
assert_select 'dmsf_file > description', :text => @file1.last_revision.description
assert_select 'dmsf_file > content_url', :text => "/dmsf/files/#{@file1.id}/download"
assert_select 'dmsf_file > content_url', :text => "http://www.example.com/dmsf/files/#{@file1.id}/download"
#curl -v -H "Content-Type: application/octet-stream" -X GET -u ${1}:${2} http://localhost:3000/dmsf/files/41532/download > file.txt
get "/dmsf/files/#{@file1.id}/download?key=#{token.value}"
assert_response :success