diff --git a/app/controllers/v1/learning_objects_controller.rb b/app/controllers/v1/learning_objects_controller.rb index b42445adc219a22e3580ba2a69dd75118407ecba..11869ceb1e6ca9470054311c67883b81fd8028e7 100644 --- a/app/controllers/v1/learning_objects_controller.rb +++ b/app/controllers/v1/learning_objects_controller.rb @@ -76,7 +76,12 @@ class V1::LearningObjectsController < ApplicationController # Use callbacks to share common setup or constraints between actions. def set_learning_object - @learning_object ||= LearningObject.unscoped.find(params[:id]) + #check if user is admin to show destroyed object + if current_user.try(:is_admin?) + @learning_object ||= LearningObject.unscoped.find(params[:id]) + else + @learning_object ||= LearningObject.find(params[:id]) + end end def set_new_learning_object diff --git a/app/serializers/collection_serializer.rb b/app/serializers/collection_serializer.rb index 790640ffab30e1178ea168916c7abea4d218b16d..e8cff1baacf1e7995660829e478abb6d40f7b8c8 100644 --- a/app/serializers/collection_serializer.rb +++ b/app/serializers/collection_serializer.rb @@ -16,7 +16,7 @@ class CollectionSerializer < ActiveModel::Serializer def items_thumbnails thumbs = [] i = 0 - while thumbs.size < 4 && i < object.collection_items.size do + while thumbs.size < 6 && i < object.collection_items.size do t = object.collection_items[i].thumbnail thumbs << t unless t.blank? i=i+1