Mercurial > hg > soundsoftware-site

changeset 1223:324461c477a7 cannam

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author Chris Cannam <chris.cannam@soundsoftware.ac.uk>
date Tue, 12 Mar 2013 14:39:49 +0000
parents 2c59ee348e2b (diff) 31aee88c279b (current diff)
children 30c444ea1338
files
diffstat 2 files changed, 6 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- 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,
--- 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