Andreas/tracks
1
0
Fork 0
mirror of https://github.com/TracksApp/tracks.git synced 2025-12-22 02:00:12 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Extract rendering to helper method. Shift filename sanitization to controller.

Browse source
This commit is contained in:
Jan-Yves Ruzicka 2015-04-03 12:13:21 +01:00
parent 7801364662
commit ccf13418f4
12 changed files with 105 additions and 78 deletions
Download patch file Download diff file Expand all files Collapse all files

9
app/controllers/data_controller.rb
View file

@ -31,7 +31,7 @@ class DataController < ApplicationController
#save file for later
begin
uploaded_file = params[:file]
@filename = Tracks::Utils.sanitize_filename(uploaded_file.original_filename)
@filename = sanitize_filename(uploaded_file.original_filename)
path_and_file = Rails.root.join('public', 'uploads', 'csv', @filename)
File.open(path_and_file, "wb") { |f| f.write(uploaded_file.read) }
rescue Exception => e
@ -57,7 +57,7 @@ class DataController < ApplicationController
def csv_import
begin
filename = Tracks::Utils.sanitize_filename(params[:file])
filename = sanitize_filename(params[:file])
path_and_file = Rails.root.join('public', 'uploads', 'csv', filename)
case params[:import_to]
when 'projects'
@ -209,4 +209,9 @@ class DataController < ApplicationController
raise "YAML loading is disabled"
end
private
def sanitize_filename(filename)
filename.gsub(/[^0-9A-z.\-]/, '_')
end
end