jro_apps/redmine Commit - r2064:fce4615f10ad

Display latest user's activity on account/show view....

Jean-Philippe Lang -

r2064:fce4615f10ad

parent child

Context file:

r2064:fce4615f10ad

Collapse all files

app/controllers/account_controller.rb +6 -2

-            # redMine - project management software
+            # Redmine - project management software
-            # Copyright (C) 2006-2007  Jean-Philippe Lang
+            # Copyright (C) 2006-2008  Jean-Philippe Lang
             #
             # This program is free software; you can redistribute it and/or
             # modify it under the terms of the GNU General Public License
                 @memberships = @user.memberships.select do |membership|
                   membership.project.is_public? || (User.current.member_of?(membership.project))
                 end
+                events = Redmine::Activity::Fetcher.new(User.current, :author => @user).events(nil, nil, :limit => 10)
+                @events_by_day = events.group_by(&:event_date)
               rescue ActiveRecord::RecordNotFound
                 render_404
               end

app/helpers/application_helper.rb +12 0

@@ -105,6 +105,18 module ApplicationHelper
105	@time_format \|\|= (Setting.time_format.blank? ? l(:general_fmt_time) : Setting.time_format)	105	@time_format \|\|= (Setting.time_format.blank? ? l(:general_fmt_time) : Setting.time_format)
106	include_date ? local.strftime("#{@date_format} #{@time_format}") : local.strftime(@time_format)	106	include_date ? local.strftime("#{@date_format} #{@time_format}") : local.strftime(@time_format)
107	end	107	end
		108
		109	def format_activity_title(text)
		110	h(truncate_single_line(text, 100))
		111	end
		112
		113	def format_activity_day(date)
		114	date == Date.today ? l(:label_today).titleize : format_date(date)
		115	end
		116
		117	def format_activity_description(text)
		118	h(truncate(text.to_s, 250).gsub(%r{<(pre\|code)>.*$}m, '...'))
		119	end
108		120
109	def distance_of_date_in_words(from_date, to_date = 0)	121	def distance_of_date_in_words(from_date, to_date = 0)
110	from_date = from_date.to_date if from_date.respond_to?(:to_date)	122	from_date = from_date.to_date if from_date.respond_to?(:to_date)

app/helpers/projects_helper.rb 0 -12

@@ -21,18 +21,6 module ProjectsHelper
21	link_to h(version.name), { :controller => 'versions', :action => 'show', :id => version }, options	21	link_to h(version.name), { :controller => 'versions', :action => 'show', :id => version }, options
22	end	22	end
23		23
24	def format_activity_title(text)
25	h(truncate_single_line(text, 100))
26	end
27
28	def format_activity_day(date)
29	date == Date.today ? l(:label_today).titleize : format_date(date)
30	end
31
32	def format_activity_description(text)
33	h(truncate(text.to_s, 250).gsub(%r{<(pre\|code)>.*$}m, '...'))
34	end
35
36	def project_settings_tabs	24	def project_settings_tabs
37	tabs = [{:name => 'info', :action => :edit_project, :partial => 'projects/edit', :label => :label_information_plural},	25	tabs = [{:name => 'info', :action => :edit_project, :partial => 'projects/edit', :label => :label_information_plural},
38	{:name => 'modules', :action => :select_project_modules, :partial => 'projects/settings/modules', :label => :label_module_plural},	26	{:name => 'modules', :action => :select_project_modules, :partial => 'projects/settings/modules', :label => :label_module_plural},

app/models/attachment.rb +2 0

               acts_as_activity_provider :type => 'files',
                                         :permission => :view_files,
+                                        :author_key => :author_id,
                                         :find_options => {:select => "#{Attachment.table_name}.*",
                                                           :joins => "LEFT JOIN #{Version.table_name} ON #{Attachment.table_name}.container_type='Version' AND #{Version.table_name}.id = #{Attachment.table_name}.container_id " +
                                                                     "LEFT JOIN #{Project.table_name} ON #{Version.table_name}.project_id = #{Project.table_name}.id"}
               acts_as_activity_provider :type => 'documents',
                                         :permission => :view_documents,
+                                        :author_key => :author_id,
                                         :find_options => {:select => "#{Attachment.table_name}.*",
                                                           :joins => "LEFT JOIN #{Document.table_name} ON #{Attachment.table_name}.container_type='Document' AND #{Document.table_name}.id = #{Attachment.table_name}.container_id " +
                                                                     "LEFT JOIN #{Project.table_name} ON #{Document.table_name}.project_id = #{Project.table_name}.id"}

app/models/changeset.rb +1 0

                                  :date_column => 'committed_on'
               acts_as_activity_provider :timestamp => "#{table_name}.committed_on",
+                                        :author_key => :user_id,
                                         :find_options => {:include => {:repository => :project}}
               validates_presence_of :repository_id, :revision, :committed_on, :commit_date

app/models/issue.rb +2 -1

               acts_as_event :title => Proc.new {|o| "#{o.tracker.name} ##{o.id}: #{o.subject}"},
                             :url => Proc.new {|o| {:controller => 'issues', :action => 'show', :id => o.id}}
-              acts_as_activity_provider :find_options => {:include => [:project, :author, :tracker]}
+              acts_as_activity_provider :find_options => {:include => [:project, :author, :tracker]},
+                                        :author_key => :author_id
               validates_presence_of :subject, :description, :priority, :project, :tracker, :author, :status
               validates_length_of :subject, :maximum => 255

app/models/journal.rb +1 0

               acts_as_activity_provider :type => 'issues',
                                         :permission => :view_issues,
+                                        :author_key => :user_id,
                                         :find_options => {:include => [{:issue => :project}, :details, :user],
                                                           :conditions => "#{Journal.table_name}.journalized_type = 'Issue' AND" +
                                                                          " (#{JournalDetail.table_name}.prop_key = 'status_id' OR #{Journal.table_name}.notes <> '')"}

app/models/message.rb +2 -1

                             :url => Proc.new {|o| {:controller => 'messages', :action => 'show', :board_id => o.board_id}.merge(o.parent_id.nil? ? {:id => o.id} :
                                                                                                                                                    {:id => o.parent_id, :anchor => "message-#{o.id}"})}
-              acts_as_activity_provider :find_options => {:include => [{:board => :project}, :author]}
+              acts_as_activity_provider :find_options => {:include => [{:board => :project}, :author]},
+                                        :author_key => :author_id
               acts_as_watchable
               attr_protected :locked, :sticky

app/models/news.rb +2 -1

               acts_as_searchable :columns => ['title', "#{table_name}.description"], :include => :project
               acts_as_event :url => Proc.new {|o| {:controller => 'news', :action => 'show', :id => o.id}}
-              acts_as_activity_provider :find_options => {:include => [:project, :author]}
+              acts_as_activity_provider :find_options => {:include => [:project, :author]},
+                                        :author_key => :author_id
               # returns latest news for projects visible by user
               def self.latest(user = User.current, count = 5)

app/models/wiki_content.rb +1 0

                 acts_as_activity_provider :type => 'wiki_edits',
                                           :timestamp => "#{WikiContent.versioned_table_name}.updated_on",
+                                          :author_key => "#{WikiContent.versioned_table_name}.author_id",
                                           :permission => :view_wiki_edits,
                                           :find_options => {:select => "#{WikiContent.versioned_table_name}.updated_on, #{WikiContent.versioned_table_name}.comments, " +
                                                                        "#{WikiContent.versioned_table_name}.#{WikiContent.version_column}, #{WikiPage.table_name}.title, " +

app/views/account/show.rhtml +25 0

@@ -4,6 +4,7
4		4
5	<h2><%= avatar @user %> <%=h @user.name %></h2>	5	<h2><%= avatar @user %> <%=h @user.name %></h2>
6		6
		7	<div class="splitcontentleft">
7	<p>	8	<p>
8	<%= mail_to(h(@user.mail)) unless @user.pref.hide_mail %>	9	<%= mail_to(h(@user.mail)) unless @user.pref.hide_mail %>
9	<ul>	10	<ul>
@@ -25,8 +26,32
25	<% end %>	26	<% end %>
26	</ul>	27	</ul>
27	<% end %>	28	<% end %>
		29	</div>
		30
		31	<div class="splitcontentright">
28		32
		33	<% unless @events_by_day.empty? %>
29	<h3><%=l(:label_activity)%></h3>	34	<h3><%=l(:label_activity)%></h3>
		35
30	<p>	36	<p>
31	<%=l(:label_reported_issues)%>: <%= Issue.count(:conditions => ["author_id=?", @user.id]) %>	37	<%=l(:label_reported_issues)%>: <%= Issue.count(:conditions => ["author_id=?", @user.id]) %>
32	</p>	38	</p>
		39
		40	<div id="activity">
		41	<% @events_by_day.keys.sort.reverse.each do \|day\| %>
		42	<h4><%= format_activity_day(day) %></h4>
		43	<dl>
		44	<% @events_by_day[day].sort {\|x,y\| y.event_datetime <=> x.event_datetime }.each do \|e\| -%>
		45	<dt class="<%= e.event_type %>">
		46	<span class="time"><%= format_time(e.event_datetime, false) %></span>
		47	<%= content_tag('span', h(e.project), :class => 'project') %>
		48	<%= link_to format_activity_title(e.event_title), e.event_url %></dt>
		49	<dd><span class="description"><%= format_activity_description(e.event_description) %></span></dd>
		50	<% end -%>
		51	</dl>
		52	<% end -%>
		53	</div>
		54	<% end %>
		55	</div>
		56
		57	<% html_title @user.name %>

lib/redmine/activity/fetcher.rb +8 -2

                   @@constantized_providers = Hash.new {|h,k| h[k] = Redmine::Activity.providers[k].collect {|t| t.constantize } }
                   def initialize(user, options={})
-                    options.assert_valid_keys(:project, :with_subprojects)
+                    options.assert_valid_keys(:project, :with_subprojects, :author)
                     @user = user
                     @project = options[:project]
                     @options = options
                   end
                   # Returns an array of events for the given date range
-                  def events(from, to)
+                  def events(from = nil, to = nil, options={})
                     e = []
+                    @options[:limit] = options[:limit]
                     @scope.each do |event_type|
                       constantized_providers(event_type).each do |provider|
                         e += provider.find_events(event_type, @user, from, to, @options)
                       end
                     end
+                    if options[:limit]
+                      e.sort! {|a,b| b.event_date <=> a.event_date}
+                      e = e.slice(0, options[:limit])
+                    end
                     e
                   end

test/unit/activity_test.rb +9 0

@@ -63,6 +63,15 class ActivityTest < Test::Unit::TestCase
63	assert events.include?(Issue.find(4))	63	assert events.include?(Issue.find(4))
64	end	64	end
65		65
		66	def test_user_activity
		67	user = User.find(2)
		68	events = Redmine::Activity::Fetcher.new(User.anonymous, :author => user).events(nil, nil, :limit => 10)
		69
		70	assert(events.size > 0)
		71	assert(events.size <= 10)
		72	assert_nil(events.detect {\|e\| e.event_author != user})
		73	end
		74
66	private	75	private
67		76
68	def find_events(user, options={})	77	def find_events(user, options={})

vendor/plugins/acts_as_activity_provider/lib/acts_as_activity_provider.rb +15 -3

                         send :include, Redmine::Acts::ActivityProvider::InstanceMethods
                       end
-                      options.assert_valid_keys(:type, :permission, :timestamp, :find_options)
+                      options.assert_valid_keys(:type, :permission, :timestamp, :author_key, :find_options)
                       self.activity_provider_options ||= {}
                       # One model can provide different event types
                       options[:permission] = "view_#{self.name.underscore.pluralize}".to_sym unless options.has_key?(:permission)
                       options[:timestamp] ||= "#{table_name}.created_on"
                       options[:find_options] ||= {}
+                      options[:author_key] = "#{table_name}.#{options[:author_key]}" if options[:author_key].is_a?(Symbol)
                       self.activity_provider_options[event_type] = options
                     end
                   end
                         provider_options = activity_provider_options[event_type]
                         raise "#{self.name} can not provide #{event_type} events." if provider_options.nil?
-                        cond = ARCondition.new(["#{provider_options[:timestamp]} BETWEEN ? AND ?", from, to])
+                        scope_options = {}
+                        cond = ARCondition.new
+                        if from && to
+                          cond.add(["#{provider_options[:timestamp]} BETWEEN ? AND ?", from, to])
+                        end
+                        if options[:author]
+                          return [] if provider_options[:author_key].nil?
+                          cond.add(["#{provider_options[:author_key]} = ?", options[:author].id])
+                        end
                         cond.add(Project.allowed_to_condition(user, provider_options[:permission], options)) if provider_options[:permission]
+                        scope_options[:conditions] = cond.conditions
+                        scope_options[:order] = "#{provider_options[:timestamp]} DESC"
+                        scope_options[:limit] = options[:limit]
-                        with_scope(:find => { :conditions => cond.conditions }) do
+                        with_scope(:find => scope_options) do
                           find(:all, provider_options[:find_options])
                         end
                       end

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages