[myexperiment-hackers] [3799] branches/packs/app/helpers/activities_helper.rb: added attributions to activity feeds

[noreply]

Revision

3799

Author

dgc

Date

2013-11-19 15:30:52 +0000 (Tue, 19 Nov 2013)

Log Message

added attributions to activity feeds

Modified Paths

• branches/packs/app/helpers/activities_helper.rb

Diff

Modified: branches/packs/app/helpers/activities_helper.rb (3798 => 3799)

--- branches/packs/app/helpers/activities_helper.rb	2013-11-19 15:05:46 UTC (rev 3798)
+++ branches/packs/app/helpers/activities_helper.rb	2013-11-19 15:30:52 UTC (rev 3799)
@@ -92,6 +92,7 @@
     type_bits << "(activities.objekt_type = 'Membership' AND activities.action = '')"
     type_bits << "(activities.objekt_type = 'Resource' AND activities.action = '')"
     type_bits << "(activities.objekt_type = 'Resource' AND activities.action = '')"
+    type_bits << "(activities.objekt_type = 'Attribution' AND activities.action = '')"
 
     # Create the conditions
 
@@ -110,7 +111,7 @@
     activities = Authorization.scoped(Activity,
         :auth_type       => 'activities.auth_type',
         :auth_id         => 'activities.auth_id',
-        :group           => 'activities.id',
+        :group           => 'activities.uuid',
         :authorised_user => opts[:user])
     
     results = []
@@ -280,6 +281,8 @@
         end
       when "Resource destroy"
         "#{activity_link(activity, :subject)} deleted #{h(activity.objekt_label)}"
+      when "Attribution create"
+        "#{activity_link(activity, :subject)} attributed #{h(activity.objekt.attributor.label)} from #{h(activity.objekt.attributable.label)}"
       end
 
     rescue