Mercurial > hg > soundsoftware-site
changeset 958:352539ac7b43 live
Merge from branch "bug_521"
author | Chris Cannam |
---|---|
date | Tue, 16 Oct 2012 15:36:12 +0100 |
parents | 42e2437766c2 (current diff) 35782bf2eb58 (diff) |
children | f8985bd5d0d6 a9f1192c9c79 |
files | |
diffstat | 1 files changed, 3 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/app/controllers/attachments_controller.rb Wed Aug 29 15:55:57 2012 +0100 +++ b/app/controllers/attachments_controller.rb Tue Oct 16 15:36:12 2012 +0100 @@ -49,9 +49,9 @@ end def download - if @attachment.container.is_a?(Version) || @attachment.container.is_a?(Project) - @attachment.increment_download - end + # cc: formerly this happened only if "@attachment.container.is_a?(Version)" + # or Project. Not good for us, we want to tally all downloads + @attachment.increment_download # images are sent inline send_file @attachment.diskfile, :filename => filename_for_content_disposition(@attachment.filename),