summaryrefslogtreecommitdiffstats
path: root/app
diff options
context:
space:
mode:
authorJean-Philippe Lang <jp_lang@yahoo.fr>2016-05-08 08:04:51 +0000
committerJean-Philippe Lang <jp_lang@yahoo.fr>2016-05-08 08:04:51 +0000
commitb553b23e6b9d712d9c1168cbb167a2bbfd9ec088 (patch)
tree8e6a59e4dba0c32eac4e13ef37023abdd595199c /app
parent3d2c198c0f889e73ae2a16a068c41948b40cefff (diff)
downloadredmine-b553b23e6b9d712d9c1168cbb167a2bbfd9ec088.tar.gz
redmine-b553b23e6b9d712d9c1168cbb167a2bbfd9ec088.zip
Show attachment view even is no preview is available (#22482).
Patch by Gregor Schmidt. git-svn-id: http://svn.redmine.org/redmine/trunk@15398 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app')
-rw-r--r--app/controllers/attachments_controller.rb2
-rw-r--r--app/views/attachments/other.html.erb3
2 files changed, 4 insertions, 1 deletions
diff --git a/app/controllers/attachments_controller.rb b/app/controllers/attachments_controller.rb
index 8c6b4484e..14025cb86 100644
--- a/app/controllers/attachments_controller.rb
+++ b/app/controllers/attachments_controller.rb
@@ -43,7 +43,7 @@ class AttachmentsController < ApplicationController
elsif @attachment.is_image?
render :action => 'image'
else
- download
+ render :action => 'other'
end
}
format.api
diff --git a/app/views/attachments/other.html.erb b/app/views/attachments/other.html.erb
new file mode 100644
index 000000000..e6244c16e
--- /dev/null
+++ b/app/views/attachments/other.html.erb
@@ -0,0 +1,3 @@
+<%= render :layout => 'layouts/file' do %>
+ <%= render :partial => 'common/other' %>
+<% end %>