htwkmooc/codeocean
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'exercise_upload'

Browse Source
This commit is contained in:
Sebastian Serth
2020-12-16 18:51:13 +01:00
parent b2cb1bde39 1d0b4e327a
commit 81018ceafc
4 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/exercises_controller.rb
View File

@@ -219,7 +219,7 @@ class ExercisesController < ApplicationController
file_params[:content] = nil
file_params[:native_file] = file_attributes[:content]
else
file_params[:content] = file_attributes[:content].read
file_params[:content] = file_attributes[:content].read.encode.delete("\x00")
end
end
end

6
app/views/exercises/_code_field.html.slim
View File

@@ -1,7 +1,7 @@
.form-group class="form-group-#{attribute.to_s.gsub('_', '-')}"
= form.label(attribute, label)
| &nbsp;
a.toggle-input data={text_initial: t('shared.upload_file'), text_toggled: t('shared.back')} href='#' = t('shared.upload_file')
= form.text_area(attribute, class: 'code-field form-control', rows: 16, style: "display:none;")
= form.file_field(attribute, class: 'alternative-input form-control-file', disabled: true)
= render partial: 'editor_edit', locals: { exercise: @exercise }
.card.border-warning.p-2.my-2
= form.file_field(attribute, class: 'form-control-file', style: "display: inline-block;")
.help-block.form-text = t('exercises.file_form.hints.upload')