better_record 0.14.3 → 0.14.4
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/lib/better_record/concerns/controllers/uploadable.rb +23 -22
- data/lib/better_record/version.rb +1 -1
- metadata +1 -1
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 4c8c0660e223718e9b182261ae8e634f7cb482282e992d16fff322126329b3d5
|
|
4
|
+
data.tar.gz: d9d4f4db5cd4de527f1a5dc418ef91729779c919ad2e83bc7018890c9c30eb54
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: ac488a0d94134d588ca0ae9431d7697cd60c00480ecc061304ce50319355021119d52243aed9b5c84e8f637a943dab2613c0a012a3c263112cb10cfecc6049a3
|
|
7
|
+
data.tar.gz: 546ce5b69ceadb4c63b9f546efd79544c1a5630f12de517602ba264b1020396aac2bcd944d960dc73737d12a76d697cacbcb9de9853505ed7df7d0b5269dfb47
|
|
@@ -8,10 +8,11 @@ module BetterRecord
|
|
|
8
8
|
params.require(:upload).permit(:file, :staff_id)
|
|
9
9
|
end
|
|
10
10
|
|
|
11
|
-
def csv_upload(job, whitelisted_params, upload_key, prefix, job_sym = :staff_id
|
|
12
|
-
|
|
11
|
+
def csv_upload(job, whitelisted_params, upload_key, prefix, job_sym = :staff_id)
|
|
12
|
+
|
|
13
13
|
uploaded = whitelisted_params[upload_key]
|
|
14
14
|
job_id = whitelisted_params[job_sym]
|
|
15
|
+
|
|
15
16
|
@file_stats = {
|
|
16
17
|
name: uploaded.original_filename,
|
|
17
18
|
"mime-type" => uploaded.content_type,
|
|
@@ -23,28 +24,28 @@ module BetterRecord
|
|
|
23
24
|
file.write(uploaded)
|
|
24
25
|
job.perform_later file.path, job_id, @file_stats[:name]
|
|
25
26
|
end
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
27
|
+
# begin
|
|
28
|
+
# if redirecting
|
|
29
|
+
# flash[:success] ||= []
|
|
30
|
+
# flash[:success] << 'File Uploaded'
|
|
31
|
+
# else
|
|
32
|
+
# flash.now[:success] ||= []
|
|
33
|
+
# flash.now[:success] << 'File Uploaded'
|
|
34
|
+
# end
|
|
35
|
+
# rescue NoMethodError
|
|
36
|
+
# p "Flash Messages not Enabled"
|
|
37
|
+
# end
|
|
38
|
+
|
|
39
|
+
return [200, 'File Uploaded']
|
|
34
40
|
else
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
41
|
+
return [
|
|
42
|
+
422,
|
|
43
|
+
[
|
|
44
|
+
'something went wrong',
|
|
45
|
+
'Only csv files with the correct headers are supported',
|
|
46
|
+
"content type: #{whitelisted_params[upload_key].content_type}", "file name: #{whitelisted_params[upload_key].original_filename}"
|
|
47
|
+
]
|
|
39
48
|
]
|
|
40
|
-
|
|
41
|
-
if redirecting
|
|
42
|
-
flash[:danger] = msg
|
|
43
|
-
else
|
|
44
|
-
flash.now[:danger] = msg
|
|
45
|
-
|
|
46
|
-
render :show
|
|
47
|
-
end
|
|
48
49
|
end
|
|
49
50
|
end
|
|
50
51
|
|