# HG changeset patch
# User Chris Cannam <chris.cannam@soundsoftware.ac.uk>
# Date 1363099189 0
# Node ID 324461c477a7a79dc4a1d421dc7424daf7d79c89
# Parent  2c59ee348e2beb011fb8650e2160b7d47a9584ac# Parent  31aee88c279bbef624dcd515027e22fcff01586f
Merge

diff -r 31aee88c279b -r 324461c477a7 app/controllers/my_controller.rb
--- a/app/controllers/my_controller.rb	Tue Mar 12 13:36:57 2013 +0000
+++ b/app/controllers/my_controller.rb	Tue Mar 12 14:39:49 2013 +0000
@@ -38,7 +38,7 @@
            }.merge(Redmine::Views::MyPage::Block.additional_blocks).freeze
 
   DEFAULT_LAYOUT = {  'left' => ['myprojects', 'activitymyprojects'], 
-                      'right' => ['tipoftheday', 'issueswatched'] 
+                      'right' => ['tipoftheday', 'colleagues', 'issueswatched'] 
                    }.freeze
 
   verify :xhr => true,
diff -r 31aee88c279b -r 324461c477a7 app/helpers/activities_helper.rb
--- a/app/helpers/activities_helper.rb	Tue Mar 12 13:36:57 2013 +0000
+++ b/app/helpers/activities_helper.rb	Tue Mar 12 14:39:49 2013 +0000
@@ -61,6 +61,8 @@
 
     s = ""
 
+    start = Time.now
+
     for c in colleagues
       u = User.find_by_id(c)
       active_projects = projects_by_activity(u, 3)
@@ -82,6 +84,9 @@
         s << "</div>"
       end
     end
+
+    finish = Time.now
+    logger.info "render_active_colleagues: took #{finish-start}"
     
     if s != ""
       s