Merge branch 'hotfix/5.5.8'

dodona-edu · Jun 29, 2022 · 0bd7dc3 · 0bd7dc3
2 parents 3ccc779 + fd57d33
commit 0bd7dc3
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 6 deletions.
diff --git a/app/policies/series_policy.rb b/app/policies/series_policy.rb
@@ -21,7 +21,7 @@ def index?
   def show?
     return true if course_admin?
     return false if record.closed?
-    return false if record.hidden? && user.nil?
+    return false if record.hidden? && !user&.subscribed_courses&.include?(record.course)
 
     course = record.course
     course.visible_for_all? ||

diff --git a/app/views/activities/_series_activities_table.html.erb b/app/views/activities/_series_activities_table.html.erb
@@ -52,8 +52,6 @@
         <td>
           <% if activity.accessible?(current_user, @course) %>
             <%= link_to activity.name, get_activity_path.call(activity) %>
-          <% elsif activity.access_public? %>
-            <%= link_to activity.name, activity_path(activity) %>
           <% else %>
             <%= activity.name %>
             <% if current_user&.course_admin?(@course) && current_user&.repository_admin?(activity.repository) %>

diff --git a/config/initializers/00_version.rb b/config/initializers/00_version.rb
@@ -3,7 +3,7 @@ class Application
     module Version
       MAJOR = 5
       MINOR = 5
-      PATCH = 7
+      PATCH = 8
 
       STRING = [MAJOR, MINOR, PATCH].compact.join('.')
     end

diff --git a/test/controllers/series_controller_test.rb b/test/controllers/series_controller_test.rb
@@ -280,10 +280,10 @@ def assert_show_and_overview(authorized, token: nil)
     assert_show_and_overview false
   end
 
-  test 'student should see hidden series with token' do
+  test 'unsubscribed student should not see hidden series, even with token' do
     sign_in @student
     @series.update(visibility: :hidden)
-    assert_show_and_overview true, token: @series.access_token
+    assert_show_and_overview false, token: @series.access_token
   end
 
   test 'student should not see hidden series with wrong token' do