Sutty/trabajo-afectivo
5
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Added default limit to self.recent_viewed_fulldata().

Browse source
This commit is contained in:
Martin Edenhofer 2012-10-18 21:29:56 +02:00
parent 1d805d13db
commit 303e960c5b
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
app/models/history.rb
View file

@ -115,7 +115,7 @@ class History < ActiveRecord::Base
return list return list
end end
def self.activity_stream(user, limit = 10) def self.activity_stream( user, limit = 10 )
# g = Group.where( :active => true ).joins(:users).where( 'users.id' => user.id ) # g = Group.where( :active => true ).joins(:users).where( 'users.id' => user.id )
# stream = History.select("distinct(histories.o_id), created_by_id, history_attribute_id, history_type_id, history_object_id, value_from, value_to"). # stream = History.select("distinct(histories.o_id), created_by_id, history_attribute_id, history_type_id, history_object_id, value_from, value_to").
# where( :history_type_id => History::Type.where( :name => ['created', 'updated']) ). # where( :history_type_id => History::Type.where( :name => ['created', 'updated']) ).
@ -136,7 +136,7 @@ class History < ActiveRecord::Base
end end
return datas return datas
end end
def self.activity_stream_fulldata(user, limit = 10) def self.activity_stream_fulldata( user, limit = 10 )
activity_stream = History.activity_stream( user, limit ) activity_stream = History.activity_stream( user, limit )
# get related users # get related users
@ -209,7 +209,7 @@ class History < ActiveRecord::Base
return datas return datas
end end
def self.recent_viewed_fulldata( user, limit ) def self.recent_viewed_fulldata( user, limit = 10 )
recent_viewed = History.recent_viewed( user, limit ) recent_viewed = History.recent_viewed( user, limit )
# get related users # get related users