Merge branch 'master' of gitlab.c3sl.ufpr.br:portalmec/portalmec into rspec

app/models/concerns/trackable.rb

@@ -23,15 +23,17 @@ module Trackable
   end
 
   def new_destroy_activity
-    new_activity(:destroy)
+    params = { name: self.try(:name)}
+    new_activity(:destroy,params)
   end
 
-  def new_activity(action)
+  def new_activity(action,params=nil)
     create_activity(
       action,
       owner: activity_owner,
       recipient: activity_recipient,
-      privacy: activity_privacy
+      privacy: activity_privacy,
+      parameters: params
     )
   end
 

app/serializers/user_serializer.rb

@@ -13,6 +13,10 @@ class UserSerializer < ActiveModel::Serializer
     object.email if (current_user != nil)&&(object.id == current_user.id || current_user.is_admin?)
   end
 
+  def learning_objects_count
+    object.learning_objects.where('state = ?', LearningObject.states[:published]).count
+  end
+
   attributes :id, :email, :provider, :name, :description, :education, :score, :cover, :role_ids, :institution_ids, :avatar, :likes_count, :followed, :complained, :follows_count, :learning_objects_count, :collections_count, :created_at, :updated_at
   has_many :subjects
 end