merge master

2019-12-09 20:54:24 +01:00
parent 4fd440b1f6 8b27a41743
commit 466202fc87
7 changed files with 444 additions and 212 deletions
--- a/app/policies/exercise_policy.rb
+++ b/app/policies/exercise_policy.rb
@ -8,7 +8,7 @@ class ExercisePolicy < AdminOrAuthorPolicy
  end

  [:clone?, :destroy?, :edit?, :update?, :export_external_check?, :export_external_confirm?].each do |action|
-    define_method(action) { admin? || author? }
+    define_method(action) { admin? || teacher_in_study_group || author? }
  end

  [:implement?, :working_times?, :intervention?, :search?, :submit?, :reload?].each do |action|