Download as
Browse Code »

Commit ae53955258757f3dbb94f45fc9daf451c8923a44

Authored by Leandro Santos
1 parent 3c7ef3f4
Exists in fix_sign_up_form

show scrap in profile activities endpoint

Showing 2 changed files with 13 additions and 2 deletions   Show diff stats
app/api/entities.rb
  Diff comments   View file @ae53955
... ... @@ -295,12 +295,20 @@ module Api
295 295  
296 296 class Activity < Entity
297 297 root 'activities', 'activity'
298   - expose :id, :params, :verb, :created_at, :updated_at, :comments_count, :visible
299   - expose :user, :using => Profile
  298 + expose :id, :created_at, :updated_at
300 299 expose :target do |activity, opts|
301 300 type_map = {Profile => ::Profile, ArticleBase => ::Article}.find {|h| activity.target.kind_of?(h.last)}
302 301 type_map.first.represent(activity.target) unless type_map.nil?
303 302 end
  303 + expose :params, :if => lambda { |activity, options| activity.kind_of?(ActionTracker::Record)}
  304 + expose :content, :if => lambda { |activity, options| activity.kind_of?(Scrap)}
  305 + expose :verb do |activity, options|
  306 + activity.kind_of?(Scrap) ? 'scrap' : activity.verb
  307 + end
  308 +
  309 + expose :user, :using => Profile# do |activity, opts|
  310 +# activity.kind_of?(Scrap) ? activity.sender : activity.user
  311 +# end
304 312 end
305 313  
306 314 class Role < Entity
... ...
app/models/scrap.rb
  Diff comments   View file @ae53955
... ... @@ -36,6 +36,9 @@ class Scrap &lt; ApplicationRecord
36 36  
37 37 before_validation :strip_all_html_tags
38 38  
  39 + alias :user :sender
  40 + alias :target :receiver
  41 +
39 42 def top_root
40 43 scrap = self
41 44 scrap = Scrap.find(scrap.scrap_id) while scrap.scrap_id
... ...