Skip to content

Commit

Permalink
Fix is_project method in submission model.
Browse files Browse the repository at this point in the history
  • Loading branch information
hermanzdosilovic committed Oct 11, 2020
1 parent 600f5aa commit 6426ac6
Showing 1 changed file with 6 additions and 6 deletions.
12 changes: 6 additions & 6 deletions app/models/submission.rb
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@ def compile_output=(value)


def language
@language ||= Language.unscoped.find(language_id)
@language ||= Language.unscoped.find_by(id: language_id)
end


Expand All @@ -155,15 +155,15 @@ def status=(status)


def is_project
language.try(:is_project)
language.try(:is_project) || false
end

private

def language_existence
if language_id && !Language.unscoped.exists?(language_id)
if not language
errors.add(:language_id, "language with id #{language_id} doesn't exist")
elsif language_id && Language.unscoped.find(language_id).try(:is_archived)
elsif language.is_archived
errors.add(:language_id, "language with id #{language_id} is archived and cannot be used anymore")
end
end
Expand All @@ -176,13 +176,13 @@ def compiler_options_allowed
return
end

if Language.unscoped.exists?(language_id) && language.compile_cmd.nil?
if language && language.compile_cmd.nil?
errors.add(:compiler_options, "setting compiler options is only allowed for compiled languages")
return
end

@@allowed_languages ||= Config::ALLOWED_LANGUAGES_FOR_COMPILER_OPTIONS.collect{ |s| s + " " }
if Language.unscoped.exists?(language_id) && @@allowed_languages.present? && !language.name.starts_with?(*@@allowed_languages)
if language && @@allowed_languages.present? && !language.name.starts_with?(*@@allowed_languages)
@@allowed_languages_message ||= @@allowed_languages.size > 1 ? @@allowed_languages[0..-2].collect{ |s| s.strip }.join(", ") + " and " + @@allowed_languages[-1].strip : @@allowed_languages[0].strip
errors.add(:compiler_options, "setting compiler options is only allowed for #{@@allowed_languages_message}")
end
Expand Down

0 comments on commit 6426ac6

Please sign in to comment.