diff --git a/app/serializers/collection_serializer.rb b/app/serializers/collection_serializer.rb index a5f39efb52ecc4dc451d293efb9e9a2f24edfac4..f945282c2a26db20e6134fd75757f399f56e6e52 100644 --- a/app/serializers/collection_serializer.rb +++ b/app/serializers/collection_serializer.rb @@ -14,7 +14,7 @@ class CollectionSerializer < ActiveModel::Serializer end def followed - object.followed? current_user + current_user.try(:following?, object) end def items_thumbnails diff --git a/app/serializers/user_serializer.rb b/app/serializers/user_serializer.rb index e8d1f3e82dff625186ab5e63fd3c95cfd39edcec..e59d014590f1f264f09350ce570b1d3b86f2da7c 100644 --- a/app/serializers/user_serializer.rb +++ b/app/serializers/user_serializer.rb @@ -6,7 +6,7 @@ class UserSerializer < ActiveModel::Serializer end def followed - object.followed? current_user + current_user.try( :following?, object) end def email