Merge branch 'master' into show-public-collections

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

app/serializers/collection_serializer.rb

@@ -20,7 +20,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