Skip to content

Commit dcf9d52

Browse files
committed
allow file download
1 parent 58ce6c2 commit dcf9d52

3 files changed

Lines changed: 16 additions & 19 deletions

File tree

app/controllers/exercises_controller.rb

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -623,16 +623,26 @@ def practice
623623
allresfiles = @exercise_version.prompts[0].question.scan(/\!\[\]\((.*?)\)/)
624624
allresfiles.each do |filename|
625625
if allOwnerships.find_by(filename: filename[0]).nil?
626-
@exercise_version.prompts[0].question = @exercise_version.prompts[0].question.gsub("![](#{filename[0]})", "![](**IMAGE DOES NOT EXIST**)")
626+
@exercise_version.prompts[0].question = @exercise_version.prompts[0].question.gsub("![](#{filename[0]})", "[**#{filename[0]}** does not exist!]")
627+
627628
else
628629
uniqueFile = ResourceFile.where(id: allOwnerships.find_by(filename: filename[0]).resource_file_id)[0].filename
629630
uniqueFilename = uniqueFile.model.token+uniqueFile.file.file.match(/\.\w*/)[0]
630631
@exercise_version.prompts[0].question = @exercise_version.prompts[0].question.gsub("![](#{filename[0]})", "![](/uploads/resource_file/#{uniqueFilename})")
631632
end
632-
633633
end
634+
@allFiles= []
635+
@allFilesRegularName= []
636+
allOwnerships.each do |res|
637+
if ![".jpg",".jpeg",".png",".gif"].include?(File.extname(res.filename))
638+
@allFilesRegularName.push(res.filename)
639+
uniqueFile = ResourceFile.where(id: res.resource_file_id)[0].filename
640+
uniqueFilename = uniqueFile.model.token+uniqueFile.file.file.match(/\.\w*/)[0]
641+
@allFiles.push(uniqueFilename)
642+
end
643+
end
644+
@fileres = @allFiles.zip @allFilesRegularName
634645
render layout: 'two_columns'
635-
636646
end
637647

638648

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
%p.text.text-info
22
Use the editor below or upload an existing YAML file from your computer.
3-
43
- # list will be [ "Only Me", "user's", "user", "groups", "Everybody"
54
- access_control_items = @user_groups.map{ |g| [ g.name, g.id ] }.unshift(['Only Me', 0]).push(['Everybody', -1])
65
= semantic_form_for @exercise, url: exercises_upload_create_path, method: :post do |f|
@@ -17,16 +16,9 @@
1716
input_html: { class: 'code', autofocus: true, data: { lang: 'text/x-yaml' },
1817
value: @text_representation.present? ? @text_representation : '' },
1918
label: 'YAML Representation of the Exercise:'
20-
21-
22-
23-
2419
= f.text_field :fileList, value: "", :type => "hidden"
2520
= f.text_field :oldfileList, value: @ownerships_all, :type => "hidden"
2621
= f.text_field :ownerships_res_name, value: @ownerships_res_name, :type => "hidden"
27-
28-
29-
3022
#fileName
3123
#filelist.container.hidden
3224
.row
@@ -41,22 +33,14 @@
4133
%th.col-sm-1 Pixel
4234
%th.col-sm-1 Uploaded
4335
%th.col-sm-1 Delete
44-
45-
4636
.image-upload
4737
%label{:for => "exercise_files"}
4838
%a.btn.btn-info.btn-lg{class: 'btn btn-primary'}
4939
%span.glyphicon.glyphicon-file
50-
5140
= f.file_field :files, multiple: true
52-
53-
54-
5541
= stylesheet_link_tag "exercise_uploader.scss"
5642
= javascript_include_tag 'exercise_uploader.js'
5743
%p
5844
.row
5945
.col-md-9
6046
= f.submit class: 'btn btn-primary', value: 'Submit'
61-
62-

app/views/exercises/practice.html.haml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,9 @@
3131
- prompt.examples.each do |example|
3232
= example.display_description
3333
%br
34+
-@fileres.each do |uniqueName, realName|
35+
%p
36+
=link_to "#{realName}", "/uploads/resource_file/#{uniqueName}"
3437
.col-md-7#user-deadline{ data: { deadline: @user_deadline, server_now: @server_now } }
3538
%h2 Your Answer:
3639
= semantic_form_for @exercise_version,

0 commit comments

Comments
 (0)