Merge branch 'master' into editor-frontend-refactor

Conflicts:
	codeocean-dockerconfig.md

Gemfile.lock

@@ -96,8 +96,8 @@ GEM
       coffee-script-source
       execjs
     coffee-script-source (1.10.0)
-    concurrent-ruby (1.0.0)
-    concurrent-ruby (1.0.0-java)
+    concurrent-ruby (1.0.2)
+    concurrent-ruby (1.0.2-java)
     concurrent-ruby-ext (1.0.0)
       concurrent-ruby (~> 1.0.0)
     d3-rails (3.5.11)

app/controllers/exercises_controller.rb

@@ -247,23 +247,34 @@ class ExercisesController < ApplicationController
   end
 
   def redirect_after_submit
-    Rails.logger.debug('Score ' + @submission.normalized_score.to_s)
+    Rails.logger.debug('Redirecting user with score:s ' + @submission.normalized_score.to_s)
     if @submission.normalized_score == 1.0
-      # if user has an own rfc, redirect to it and message him to clean up and accept the answer.
+      # if user is external and has an own rfc, redirect to it and message him to clean up and accept the answer. (we need to check that the user is external,
+      # otherwise an internal user could be shown a false rfc here, since current_user.id is polymorphic, but only makes sense for external users when used with rfcs.)
+      if current_user.respond_to? :external_id
+        if rfc = RequestForComment.unsolved.where(exercise_id: @submission.exercise, user_id: current_user.id).first
+          # set a message that informs the user that his own RFC should be closed.
+          flash[:notice] = I18n.t('exercises.submit.full_score_redirect_to_own_rfc')
+          flash.keep(:notice)
 
-      # else: show open rfc for same exercise
-      if rfc = RequestForComment.unsolved.where(exercise_id: @submission.exercise).order("RANDOM()").first
+          respond_to do |format|
+            format.html { redirect_to(rfc) }
+            format.json { render(json: {redirect: url_for(rfc)}) }
+          end
+          return
 
-        # set a message that informs the user that his score was perfect and help in RFC is greatly appreciated.
-        flash[:notice] = I18n.t('exercises.submit.full_score_redirect_to_rfc')
-        flash.keep(:notice)
+        # else: show open rfc for same exercise if available
+        elsif rfc = RequestForComment.unsolved.where(exercise_id: @submission.exercise).order("RANDOM()").first
+          # set a message that informs the user that his score was perfect and help in RFC is greatly appreciated.
+          flash[:notice] = I18n.t('exercises.submit.full_score_redirect_to_rfc')
+          flash.keep(:notice)
 
-        respond_to do |format|
-          format.html { redirect_to(rfc) }
-          format.json { render(json: {redirect: url_for(rfc)}) }
+          respond_to do |format|
+            format.html { redirect_to(rfc) }
+            format.json { render(json: {redirect: url_for(rfc)}) }
+          end
+          return
         end
-
-        return
       end
     end
     redirect_to_lti_return_path

app/controllers/request_for_comments_controller.rb

@@ -82,6 +82,7 @@ class RequestForCommentsController < ApplicationController
 
     # Never trust parameters from the scary internet, only allow the white list through.
     def request_for_comment_params
+      # we are using the current_user.id here, since internal users are not able to create comments. The external_user.id is a primary key and does not require the consumer_id to be unique.
       params.require(:request_for_comment).permit(:exercise_id, :file_id, :question, :requested_at, :solved, :submission_id).merge(user_id: current_user.id, user_type: current_user.class.name)
     end
 end

codeocean-dockerconfig.md

@@ -6,4 +6,6 @@ DOCKER_OPTS='-H tcp://127.0.0.1:4243 -H unix:///var/run/docker.sock --iptables=f
 This binds the daemon to the specified socket (for access via the command line on the machine) as well as the specified tcp url.
 Either pass these options to the starting call, or specify them in the docker config file.
 
-In Ubuntu, this file is located under: /ect/default/docker
+In Ubuntu, this file is located under: /ect/default/docker
+
+In Debian, please refer to the RHEL and CentOS part under that link: https://docs.docker.com/engine/admin/#/configuring-docker-1

config/deploy.rb

@@ -3,7 +3,7 @@ set :config_example_suffix, '.example'
 set :default_env, 'PATH' => '/usr/java/jdk1.8.0_40/bin:$PATH'
 set :deploy_to, '/var/www/app'
 set :keep_releases, 3
-set :linked_dirs, %w(bin log public/uploads tmp/cache tmp/files tmp/pids tmp/sockets)
+set :linked_dirs, %w(log public/uploads tmp/cache tmp/files tmp/pids tmp/sockets)
 set :linked_files, %w(config/action_mailer.yml config/code_ocean.yml config/database.yml config/newrelic.yml config/secrets.yml config/sendmail.yml config/smtp.yml)
 set :log_level, :info
 set :puma_threads, [0, 16]

config/locales/de.yml

@@ -280,6 +280,7 @@ de:
     submit:
       failure: Beim Übermitteln Ihrer Punktzahl ist ein Fehler aufgetreten. Bitte versuchen Sie es später erneut.
       full_score_redirect_to_rfc: Herzlichen Glückwunsch! Sie haben die maximale Punktzahl für diese Aufgabe an den Kurs übertragen. Ein anderer Teilnehmer hat eine Frage zu der von Ihnen gelösten Aufgabe. Er würde sich sicherlich sehr über ihre Hilfe und Kommentare freuen.
+      full_score_redirect_to_own_rfc: Herzlichen Glückwunsch! Sie haben die maximale Punktzahl für diese Aufgabe an den Kurs übertragen. Ihre Frage ist damit wahrscheinlich gelöst? Falls ja, fügen Sie doch den entscheidenden Kniff als Antwort hinzu und markieren die Frage als gelöst, bevor sie das Fenster schließen.
     external_users:
       statistics:
         no_data_available: Keine Daten verfügbar.

config/locales/en.yml

@@ -280,6 +280,7 @@ en:
     submit:
       failure: An error occured while transmitting your score. Please try again later.
       full_score_redirect_to_rfc: Congratulations! You achieved and submitted the highest possible score for this exercise. Another participant has a question concerning the exercise you just solved. Your help and comments will be greatly appreciated!
+      full_score_redirect_to_own_rfc: Congratulations! You achieved and submitted the highest possible score for this exercise. Your question concerning the exercise is solved? If so, please share the essential insight with your fellows and mark the question as solved, before you close this window!
     external_users:
       statistics:
         no_data_available: No data available.