Merge remote-tracking branch 'origin/master' into fix-structured-errors

This commit is contained in:
Maximilian Grundke
2018-01-29 12:54:47 +01:00
6 changed files with 4 additions and 78 deletions

View File

@@ -364,7 +364,7 @@ class Exercise < ActiveRecord::Base
end
private :valid_main_file?
def needs_more_feedback
def needs_more_feedback?
user_exercise_feedbacks.size <= MAX_EXERCISE_FEEDBACKS
end

View File

@@ -57,7 +57,7 @@ class Submission < ActiveRecord::Base
end
def redirect_to_feedback?
((user_id + exercise.created_at.to_i) % 10 == 1) && exercise.needs_more_feedback
((user_id + exercise.created_at.to_i) % 10 == 1) && exercise.needs_more_feedback?
end
def own_unsolved_rfc

View File

@@ -54,8 +54,6 @@ h1 = "#{@exercise} (external user #{@external_user})"
-submission_or_intervention.testruns.each do |run|
- if run.passed
.unit-test-result.positive-result title=run.output
- elsif run.failed
.unit-test-result.negative-result title=run.output
- else
.unit-test-result.unknown-result title=run.output
td = Time.at(deltas[1..index].inject(:+)).utc.strftime("%H:%M:%S") if index > 0