Fix style

dodona-edu · Jan 2, 2025 · e80e5c9 · e80e5c9
1 parent 661bebd
commit e80e5c9
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 8 deletions.
diff --git a/app/controllers/activities_controller.rb b/app/controllers/activities_controller.rb
@@ -185,7 +185,7 @@ def update
     if labels
       labels = labels&.split(',') unless labels.is_a?(Array)
       labels = (labels + (@activity.merged_dirconfig[:labels] || []))
-      attributes[:labels] = labels&.map(&:downcase)&.uniq&.map { |name| Label.find_by(name: name) || Label.create(name: name) }
+      attributes[:labels] = labels.map(&:downcase).uniq.map { |name| Label.find_by(name: name) || Label.create(name: name) } if labels
     end
 
     respond_to do |format|

diff --git a/app/controllers/course_members_controller.rb b/app/controllers/course_members_controller.rb
@@ -74,7 +74,7 @@ def update
     course_labels = attributes[:course_labels]
     if course_labels
       course_labels = course_labels.split(',') unless course_labels.is_a?(Array)
-      attributes[:course_labels] = course_labels&.map(&:downcase)&.uniq&.map { |name| CourseLabel.find_by(course: @course, name: name) || CourseLabel.create(course: @course, name: name) }
+      attributes[:course_labels] = course_labels.map(&:downcase).uniq.map { |name| CourseLabel.find_by(course: @course, name: name) || CourseLabel.create(course: @course, name: name) } if course_labels
     end
 
     if @course_membership.update(attributes)

diff --git a/app/policies/evaluation_exercise_policy.rb b/app/policies/evaluation_exercise_policy.rb
@@ -17,7 +17,10 @@ def update?
   private
 
   def course_admin?
-    course = record&.evaluation&.series&.course
-    user&.course_admin?(course)
+    return false unless user
+    return false unless record
+
+    course = record.evaluation.series.course
+    user.course_admin?(course)
   end
 end
diff --git a/app/policies/evaluation_policy.rb b/app/policies/evaluation_policy.rb
@@ -62,6 +62,9 @@ def permitted_attributes
   private
 
   def course_admin?
-    user&.course_admin?(record&.series&.course)
+    return false unless user
+    return false unless record
+
+    user.course_admin?(record.series.course)
   end
 end
diff --git a/app/policies/feedback_policy.rb b/app/policies/feedback_policy.rb
@@ -39,6 +39,9 @@ def permitted_attributes
   private
 
   def course_admin?
-    user&.course_admin?(record&.evaluation&.series&.course)
+    return false unless user
+    return false unless record
+
+    user.course_admin?(record.evaluation.series.course)
   end
 end
diff --git a/app/policies/score_policy.rb b/app/policies/score_policy.rb
@@ -42,7 +42,10 @@ def permitted_attributes_for_update
   private
 
   def course_admin?
-    course = record&.feedback&.evaluation&.series&.course
-    user&.course_admin?(course)
+    return false unless user
+    return false unless record
+
+    course = record.feedback.evaluation.series.course
+    user.course_admin?(course)
   end
 end