diff --git a/app/models/medium.rb b/app/models/medium.rb index 540e4e593..f0f079536 100644 --- a/app/models/medium.rb +++ b/app/models/medium.rb @@ -1092,7 +1092,7 @@ def subscribed_users # if "inherit from lecture" was selected (i.e. if the annotations status of # this medium is -1). def get_annotations_status # rubocop:todo Naming/AccessorMethodName - return lecture.annotations_status if annotations_status == -1 + return lecture.annotations_status if annotations_status == -1 && lecture.present? annotations_status end diff --git a/app/views/annotations/_form_content_further_help.html.erb b/app/views/annotations/_form_content_further_help.html.erb index f3921f2a3..d2600963d 100644 --- a/app/views/annotations/_form_content_further_help.html.erb +++ b/app/views/annotations/_form_content_further_help.html.erb @@ -1,16 +1,19 @@ diff --git a/app/views/media/play.html.erb b/app/views/media/play.html.erb index a77620609..52b838860 100644 --- a/app/views/media/play.html.erb +++ b/app/views/media/play.html.erb @@ -64,7 +64,8 @@ <% if user_signed_in? %> - + <% end %>