diff --git a/app/models/learning_object.rb b/app/models/learning_object.rb index fca93372bb6018ca9f4f50cae448bec9bd0dfc5d..b3df1847119e84a9d013d838e9dc3f35ab3f7a96 100644 --- a/app/models/learning_object.rb +++ b/app/models/learning_object.rb @@ -109,6 +109,11 @@ class LearningObject < ApplicationRecord nil end + # If a LO has more than one object, this gives the location of the main one + def default_attachment_location + object_type.try(:name) == ("VÃdeo" || "Ãudio") ? default_attachment.try(:retrieve_cache_link) : default_attachment.try(:retrieve_url) + end + def default_thumbnail return thumbnail unless thumbnail.blank? return nil if attachments.blank? @@ -125,8 +130,9 @@ class LearningObject < ApplicationRecord default_attachment.retrieve_cache_link end + # Download link with all relevant objects (currently only one) def download_link - object_type.try(:name) == ("VÃdeo" || "Ãudio") ? default_attachment.try(:retrieve_cache_link) : default_attachment.try(:retrieve_url) + default_attachment_location end ## score methods diff --git a/app/serializers/learning_object_serializer.rb b/app/serializers/learning_object_serializer.rb index f9ebe61555cc612b00e7b37f441e9e888f023b72..c1d51518ec5aee29bee9284c3c9b1f6da3271571 100644 --- a/app/serializers/learning_object_serializer.rb +++ b/app/serializers/learning_object_serializer.rb @@ -37,6 +37,7 @@ class LearningObjectSerializer < ActiveModel::Serializer :thumbnail, :object_type, :language, + :default_attachment_location, :default_attachment_id, :default_mime_type, :score,