comparison app/helpers/activities_helper.rb @ 1225:edf7563e2653 live

Merge from branch "cannam"

     # recent activity, omitting any projects for which no activity
     # occurred in the recent past and any projects not visible to
     # the current user
 
     activity = Redmine::Activity::Fetcher.new(User.current, :author => user)
+
+    # Limit scope so as to exclude issues (which non-members can add)
+    activity.scope = [ "changesets", "files", "documents", "news", "wiki_edits", "messages", "time_entries", "publications" ]
+
     days = Setting.activity_days_default.to_i
     events = activity.events(Date.today - days, Date.today + 1)
     projhash = project_activity_on_events(events)
     projhash.keys.sort_by { |k| -projhash[k] }.first(count)
   end
 
   def render_active_colleagues(colleagues)
 
     s = ""
 
+    start = Time.now
+
     for c in colleagues
       u = User.find_by_id(c)
       active_projects = projects_by_activity(u, 3)
       if !active_projects.empty?
-        s << "<div class='active-person'>"
+        s << "<dl>"
+        s << "<dt>"
         s << avatar(u, :size => '24')
         s << "<span class='user'>"
         s << h(u.name)
         s << "</span>"
         if !u.ssamr_user_detail.nil?
           s << " - <span class='institution'>"
           s << h(u.ssamr_user_detail.institution_name)
           s << "</span>"
         end
-        s << "<br>"
+        s << "</dt>"
+        s << "<dd>"
         s << "<span class='active'>"
         s << (active_projects.map { |p| link_to_project(p) }.join ", ")
         s << "</span>"
-        s << "</div>"
+        s << "</dl>"
       end
     end
+
+    finish = Time.now
+    logger.info "render_active_colleagues: took #{finish-start}"
     
     if s != ""
       s
     else
       l(:label_no_active_colleagues)