Merge branch 'master' into add_groups

This commit is contained in:
rteusner
2018-12-13 16:28:34 +01:00
committed by Sebastian Serth
47 changed files with 253 additions and 116 deletions

View File

@ -10,5 +10,4 @@ class ExternalUser < User
name
end
end
end

View File

@ -1,11 +1,16 @@
class ProxyExercise < ApplicationRecord
include Creation
include DefaultValues
after_initialize :generate_token
after_initialize :set_reason
after_initialize :set_default_values
has_and_belongs_to_many :exercises
has_many :user_proxy_exercise_exercises
validates :public, boolean_presence: true
def count_files
exercises.count
end
@ -19,6 +24,11 @@ class ProxyExercise < ApplicationRecord
end
private :generate_token
def set_default_values
set_default_values_if_present(public: false)
end
private :set_default_values
def duplicate(attributes = {})
proxy_exercise = dup
proxy_exercise.attributes = attributes