comparison app/controllers/attachments_controller.rb @ 1116:bb32da3bea34 redmine-2.2-integration

Merge from live

 class AttachmentsController < ApplicationController
   before_filter :find_project, :except => :upload
   before_filter :file_readable, :read_authorize, :only => [:show, :download, :thumbnail]
   before_filter :delete_authorize, :only => :destroy
   before_filter :authorize_global, :only => :upload
+  before_filter :active_authorize, :only => :toggle_active
+
+  include AttachmentsHelper
+  helper :attachments
 
   accept_api_auth :show, :download, :upload
 
   def show
     respond_to do |format|

       format.api
     end
   end
 
   def download
-    if @attachment.container.is_a?(Version) || @attachment.container.is_a?(Project)
+    # cc: formerly this happened only if "@attachment.container.is_a?(Version)"
+    # or Project. Not good for us, we want to tally all downloads [by humans]
+    if not user_is_search_bot?
       @attachment.increment_download
     end
 
     if stale?(:etag => @attachment.digest)
       # images are sent inline

     # Make sure association callbacks are called
     @attachment.container.attachments.delete(@attachment)
     redirect_to_referer_or project_path(@project)
   end
 
+  def toggle_active
+    @attachment.active = !@attachment.active?
+    @attachment.save!
+    render :layout => false
+  end
+
 private
   def find_project
     @attachment = Attachment.find(params[:id])
     # Show 404 if the filename in the url is wrong
     raise ActiveRecord::RecordNotFound if params[:filename] && params[:filename] != @attachment.filename

 
   def delete_authorize
     @attachment.deletable? ? true : deny_access
   end
 
+  def active_authorize
+    true
+  end
+
   def detect_content_type(attachment)
     content_type = attachment.content_type
     if content_type.blank?
       content_type = Redmine::MimeType.of(attachment.filename)
     end