From 9729cc584f5758395960416f308a9c45f698cdee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Hannes=20Rosen=C3=B6gger?= <123haynes@gmail.com>
Date: Sat, 14 Feb 2015 19:52:45 +0100
Subject: implement Project::UploadsController

---
 app/controllers/files_controller.rb | 29 ++---------------------------
 1 file changed, 2 insertions(+), 27 deletions(-)

(limited to 'app/controllers/files_controller.rb')

diff --git a/app/controllers/files_controller.rb b/app/controllers/files_controller.rb
index a86340dd9bb..15523cbc2e7 100644
--- a/app/controllers/files_controller.rb
+++ b/app/controllers/files_controller.rb
@@ -1,5 +1,5 @@
 class FilesController < ApplicationController
-  def download_notes
+  def download
     note = Note.find(params[:id])
     uploader = note.attachment
 
@@ -14,32 +14,7 @@ class FilesController < ApplicationController
         not_found!
       end
     else
-      not_found!
+      redirect_to uploader.url
     end
   end
-
-  def download_files
-    namespace_id = params[:namespace]
-    project_id = params[:project]
-    folder_id = params[:folder_id]
-    filename = params[:filename]
-    project_with_namespace="#{namespace_id}/#{project_id}"
-    filename_with_id="#{folder_id}/#{filename}"
-    
-    project = Project.find_with_namespace(project_with_namespace)
-
-    uploader = FileUploader.new("#{Rails.root}/uploads","#{project_with_namespace}/#{folder_id}")
-    uploader.retrieve_from_store!(filename)
-
-    if can?(current_user, :read_project, project)
-      download(uploader)
-    else
-      not_found!
-    end
-  end
-
-  def download(uploader)
-    disposition = uploader.image? ? 'inline' : 'attachment'
-    send_file uploader.file.path, disposition: disposition
-  end
 end
-- 
cgit v1.2.1