Merge branch 'staging' into production

Leandro Santos
2 parents ef74363a a7a81940
Showing 1 changed file with 1 additions and 2 deletions Show diff stats
lib/noosfero/api/v1/articles.rb
@@ -134,8 +134,7 @@ module Noosfero
  
            #FIXME refactor this method
           get 'voted_by_me' do
-            present_articles_paginated(current_person.votes.collect(&:voteable))
-#            present_articles(current_person, 'following_articles')
+            present_articles_paginated(current_person.votes.where(:voteable_type => 'Article').collect(&:voteable))
           end
  
           desc 'Perform a vote on a article by id' do
...	...	@@ -134,8 +134,7 @@ module Noosfero
134	134
135	135	#FIXME refactor this method
136	136	get 'voted_by_me' do
137		- present_articles_paginated(current_person.votes.collect(&:voteable))
138		-# present_articles(current_person, 'following_articles')
	137	+ present_articles_paginated(current_person.votes.where(:voteable_type => 'Article').collect(&:voteable))
139	138	end
140	139
141	140	desc 'Perform a vote on a article by id' do
...	...