Merge remote-tracking branch 'origin/master' into fix-structured-errors
This commit is contained in:
@@ -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
|
||||
|
||||
|
@@ -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
|
||||
|
@@ -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
|
||||
|
Reference in New Issue
Block a user