Andreas/tracks
1
0
Fork 0
mirror of https://github.com/TracksApp/tracks.git synced 2026-02-05 15:31:47 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Code style fixes

Browse source
This commit is contained in:
Jyri-Petteri Paloposki 2020-10-10 02:27:42 +03:00
parent c6bbc67dab
commit d8acf60049
72 changed files with 458 additions and 594 deletions
Download patch file Download diff file Expand all files Collapse all files

9
app/controllers/data_controller.rb
View file

@ -1,5 +1,4 @@
class DataController < ApplicationController
require 'csv'
def index
@ -7,7 +6,6 @@ class DataController < ApplicationController
end
def import
end
def csv_map
@ -147,8 +145,7 @@ class DataController < ApplicationController
def csv_notes
content_type = 'text/csv'
CSV.generate(result = "") do |csv|
csv << ["id", "User ID", "Project", "Note",
"Created at", "Updated at"]
csv << ["id", "User ID", "Project", "Note", "Created at", "Updated at"]
# had to remove project include because it's association order is leaking
# through and causing an ambiguous column ref even with_exclusive_scope
# didn't seem to help -JamesKebinger
@ -198,7 +195,7 @@ class DataController < ApplicationController
# adjusts time to utc
def adjust_time(timestring)
if (timestring=='') or ( timestring == nil)
if (timestring == '') or (timestring == nil)
return nil
else
return Time.parse(timestring + 'UTC')
@ -210,8 +207,8 @@ class DataController < ApplicationController
end
private
def sanitize_filename(filename)
filename.gsub(/[^0-9A-z.\-]/, '_')
end
end