merge with master

2016-08-03 12:09:58 +02:00
parent d921f90a65 81b3299917
commit 4183a16178
77 changed files with 770 additions and 515 deletions
--- a/app/controllers/code_ocean/files_controller.rb
+++ b/app/controllers/code_ocean/files_controller.rb
@ -10,6 +10,11 @@ module CodeOcean

    def create
      @file = CodeOcean::File.new(file_params)
+      if @file.file_template_id
+        content = FileTemplate.find(@file.file_template_id).content
+        content.sub! '{{file_name}}', @file.name
+        @file.content = content
+      end
      authorize!
      create_and_respond(object: @file, path: proc { implement_exercise_path(@file.context.exercise, tab: 2) })
    end