Download as
Browse Code »

Commit be1b2334c9ad10742c2ace37741ab2ad2f7738cf

Authored by Leandro Santos
Committed by Rodrigo Souto
1 parent 120ec078
Exists in staging and in 41 other branches all_pending_tasks_api, api-articles-period, api_roles, caching-rails4, captcha_serpro_plugin, comments_permissions, content-manager-hostspot, elasticsearch, elasticsearch_api, elasticsearch_categories, elasticsearch_filter, elasticsearch_sort, elasticsearch_to_merge, elasticsearch_view, environment-exposes-api, export-comment-api, export-comment-paragraph, export_data, external_followers, federation-webfinger, federation_followers, federation_followers_backend, federation_oauth_provider, federation_webfinger, fix_event_date_issue, fix_notification_email, fix_string_downcase_and_upcase, follower_permition, json_cookie_serializer, login-captcha, master, master_profile_followers, oauth_external_login, oauth_login, private-scraps, private-scraps-rebase, production, production-vendorized, profile_api_improvements, user_mention, webfinger_server

return articles entities in article return

Showing 1 changed file with 4 additions and 4 deletions   Show diff stats
lib/api/v1/articles.rb
  Diff comments   View file @be1b233
... ... @@ -33,20 +33,20 @@ module API
33 33 conditions = {}
34 34 conditions[:type] = params[:content_type] if params[:content_type] #FIXME validate type
35 35 conditions[:created_at] = begin_period...end_period
36   - present environment.articles.find(:all, :conditions => conditions, :offset => (from_date.nil? ? 0 : 1), :limit => limit, :order => "created_at DESC")
  36 + present environment.articles.find(:all, :conditions => conditions, :offset => (from_date.nil? ? 0 : 1), :limit => limit, :order => "created_at DESC"), :with => Entities::Article
37 37 end
38 38  
39 39 desc "Return the article id"
40 40 get ':id' do
41   - present environment.articles.find(params[:id])
  41 + present environment.articles.find(params[:id]), , :with => Entities::Article
42 42 end
43 43  
44 44 get ':id/children' do
45   - present environment.articles.find(params[:id]).children
  45 + present environment.articles.find(params[:id]).children.find(:all, :limit => limit), , :with => Entities::Article
46 46 end
47 47  
48 48 get ':id/children/:child_id' do
49   - present environment.articles.find(params[:id]).children.find(params[:child_id])
  49 + present environment.articles.find(params[:id]).children.find(params[:child_id]), :with => Entities::Article
50 50 end
51 51  
52 52  
... ...