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

Improved code layout.

Browse source
This commit is contained in:
Martin Edenhofer 2014-12-31 15:07:56 +01:00
parent 39ec771676
commit 81fc3969f3
1 changed files with 25 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

56
app/models/activity_stream.rb
View file

@ -10,12 +10,12 @@ class ActivityStream < ApplicationModel
add a new activity entry for an object add a new activity entry for an object
ActivityStream.add( ActivityStream.add(
:type => 'updated', :type => 'updated',
:object => 'Ticket', :object => 'Ticket',
:role => 'Admin', :role => 'Admin',
:o_id => ticket.id, :o_id => ticket.id,
:created_by_id => 1, :created_by_id => 1,
:created_at => '2013-06-04 10:00:00', :created_at => '2013-06-04 10:00:00',
) )
=end =end
@ -41,11 +41,11 @@ add a new activity entry for an object
# check newest entry - is needed # check newest entry - is needed
result = ActivityStream.where( result = ActivityStream.where(
:o_id => data[:o_id], :o_id => data[:o_id],
# :activity_stream_type_id => type_id, #:activity_stream_type_id => type_id,
:role_id => role_id, :role_id => role_id,
:activity_stream_object_id => object_id, :activity_stream_object_id => object_id,
:created_by_id => data[:created_by_id] :created_by_id => data[:created_by_id]
).order('created_at DESC, id DESC').first ).order('created_at DESC, id DESC').first
# resturn if old entry is really fresh # resturn if old entry is really fresh
@ -53,13 +53,13 @@ add a new activity entry for an object
# create history # create history
record = { record = {
:o_id => data[:o_id], :o_id => data[:o_id],
:activity_stream_type_id => type_id, :activity_stream_type_id => type_id,
:activity_stream_object_id => object_id, :activity_stream_object_id => object_id,
:role_id => role_id, :role_id => role_id,
:group_id => data[:group_id], :group_id => data[:group_id],
:created_at => data[:created_at], :created_at => data[:created_at],
:created_by_id => data[:created_by_id] :created_by_id => data[:created_by_id]
} }
ActivityStream.create(record) ActivityStream.create(record)
@ -76,8 +76,8 @@ remove whole activity entries of an object
def self.remove( object_name, o_id ) def self.remove( object_name, o_id )
object_id = ObjectLookup.by_name( object_name ) object_id = ObjectLookup.by_name( object_name )
ActivityStream.where( ActivityStream.where(
:activity_stream_object_id => object_id, :activity_stream_object_id => object_id,
:o_id => o_id, :o_id => o_id,
).destroy_all ).destroy_all
end end
@ -90,7 +90,7 @@ return all activity entries of an user
=end =end
def self.list(user,limit) def self.list(user,limit)
role_ids = user.role_ids role_ids = user.role_ids
group_ids = user.group_ids group_ids = user.group_ids
# do not return an activity stream for custoers # do not return an activity stream for custoers
@ -108,9 +108,9 @@ return all activity entries of an user
end end
list = [] list = []
stream.each do |item| stream.each do |item|
data = item.attributes data = item.attributes
data['object'] = ObjectLookup.by_id( data['activity_stream_object_id'] ) data['object'] = ObjectLookup.by_id( data['activity_stream_object_id'] )
data['type'] = TypeLookup.by_id( data['activity_stream_type_id'] ) data['type'] = TypeLookup.by_id( data['activity_stream_type_id'] )
data.delete('activity_stream_object_id') data.delete('activity_stream_object_id')
data.delete('activity_stream_type_id') data.delete('activity_stream_type_id')
list.push data list.push data
@ -118,12 +118,4 @@ return all activity entries of an user
list list
end end
private
class Object < ApplicationModel
end
class Type < ApplicationModel
end
end end