<% @activity.event_types.each do |t| %>
+
<% end %>
<% if @project && @project.active_children.any? %>
diff --git a/lib/redmine.rb b/lib/redmine.rb
index 22b60e94..bd413c96 100644
--- a/lib/redmine.rb
+++ b/lib/redmine.rb
@@ -1,5 +1,6 @@
require 'redmine/access_control'
require 'redmine/menu_manager'
+require 'redmine/activity'
require 'redmine/mime_type'
require 'redmine/core_ext'
require 'redmine/themes'
@@ -132,3 +133,13 @@ Redmine::MenuManager.map :project_menu do |menu|
:if => Proc.new { |p| p.repository && !p.repository.new_record? }
menu.push :settings, { :controller => 'projects', :action => 'settings' }, :last => true
end
+
+Redmine::Activity.map do |activity|
+ activity.register :issues, :class_name => %w(Issue Journal)
+ activity.register :changesets
+ activity.register :news
+ activity.register :documents, :class_name => %w(Document Attachment)
+ activity.register :files, :class_name => 'Attachment'
+ activity.register :wiki_pages, :class_name => 'WikiContent::Version', :default => false
+ activity.register :messages, :default => false
+end
diff --git a/lib/redmine/activity.rb b/lib/redmine/activity.rb
new file mode 100644
index 00000000..144ce95e
--- /dev/null
+++ b/lib/redmine/activity.rb
@@ -0,0 +1,54 @@
+# Redmine - project management software
+# 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
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+
+module Redmine
+ module Activity
+
+ mattr_accessor :available_event_types, :default_event_types, :providers
+
+ @@available_event_types = []
+ @@default_event_types = []
+ @@providers = Hash.new {|h,k| h[k]=[] }
+
+ class << self
+ def map(&block)
+ yield self
+ end
+
+ # Registers an activity provider
+ #
+ # Options:
+ # * :class_name - one or more model(s) that provide these events (inferred from event_type by default)
+ # * :default - setting this option to false will make the events not displayed by default
+ #
+ # Examples:
+ # register :issues
+ # register :myevents, :class_name => 'Meeting'
+ def register(event_type, options={})
+ options.assert_valid_keys(:class_name, :default)
+
+ event_type = event_type.to_s
+ providers = options[:class_name] || event_type.classify
+ providers = ([] << providers) unless providers.is_a?(Array)
+
+ @@available_event_types << event_type unless @@available_event_types.include?(event_type)
+ @@default_event_types << event_type unless options[:default] == false
+ @@providers[event_type] += providers
+ end
+ end
+ end
+end
diff --git a/lib/redmine/activity/fetcher.rb b/lib/redmine/activity/fetcher.rb
new file mode 100644
index 00000000..adaead56
--- /dev/null
+++ b/lib/redmine/activity/fetcher.rb
@@ -0,0 +1,79 @@
+# Redmine - project management software
+# 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
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+
+module Redmine
+ module Activity
+ # Class used to retrieve activity events
+ class Fetcher
+ attr_reader :user, :project, :scope
+
+ # Needs to be unloaded in development mode
+ @@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)
+ @user = user
+ @project = options[:project]
+ @options = options
+
+ @scope = event_types
+ end
+
+ # Returns an array of available event types
+ def event_types
+ return @event_types unless @event_types.nil?
+
+ @event_types = Redmine::Activity.available_event_types
+ @event_types = @event_types.select {|o| @user.allowed_to?("view_#{o}".to_sym, @project)} if @project
+ @event_types
+ end
+
+ # Yields to filter the activity scope
+ def scope_select(&block)
+ @scope = @scope.select {|t| yield t }
+ end
+
+ # Sets the scope
+ def scope=(s)
+ @scope = s & event_types
+ end
+
+ # Resets the scope to the default scope
+ def default_scope!
+ @scope = Redmine::Activity.default_event_types
+ end
+
+ # Returns an array of events for the given date range
+ def events(from, to)
+ e = []
+
+ @scope.each do |event_type|
+ constantized_providers(event_type).each do |provider|
+ e += provider.find_events(event_type, @user, from, to, @options)
+ end
+ end
+ e
+ end
+
+ private
+
+ def constantized_providers(event_type)
+ @@constantized_providers[event_type]
+ end
+ end
+ end
+end
diff --git a/test/functional/projects_controller_test.rb b/test/functional/projects_controller_test.rb
index 4f0a2f17..935d5ba7 100644
--- a/test/functional/projects_controller_test.rb
+++ b/test/functional/projects_controller_test.rb
@@ -153,10 +153,6 @@ class ProjectsControllerTest < Test::Unit::TestCase
assert_response :success
assert_template 'activity'
assert_not_nil assigns(:events_by_day)
- assert_not_nil assigns(:events)
-
- # subproject issue not included by default
- assert !assigns(:events).include?(Issue.find(5))
assert_tag :tag => "h3",
:content => /#{2.days.ago.to_date.day}/,
@@ -168,7 +164,9 @@ class ProjectsControllerTest < Test::Unit::TestCase
}
}
}
-
+ end
+
+ def test_previous_project_activity
get :activity, :id => 1, :from => 3.days.ago.to_date
assert_response :success
assert_template 'activity'
@@ -186,53 +184,24 @@ class ProjectsControllerTest < Test::Unit::TestCase
}
end
- def test_activity_with_subprojects
- get :activity, :id => 1, :with_subprojects => 1
- assert_response :success
- assert_template 'activity'
- assert_not_nil assigns(:events)
-
- assert assigns(:events).include?(Issue.find(1))
- assert !assigns(:events).include?(Issue.find(4))
- # subproject issue
- assert assigns(:events).include?(Issue.find(5))
- end
-
- def test_global_activity_anonymous
+ def test_global_activity
get :activity
assert_response :success
assert_template 'activity'
- assert_not_nil assigns(:events)
+ assert_not_nil assigns(:events_by_day)
- assert assigns(:events).include?(Issue.find(1))
- # Issue of a private project
- assert !assigns(:events).include?(Issue.find(4))
+ assert_tag :tag => "h3",
+ :content => /#{5.day.ago.to_date.day}/,
+ :sibling => { :tag => "dl",
+ :child => { :tag => "dt",
+ :attributes => { :class => /issue/ },
+ :child => { :tag => "a",
+ :content => /#{Issue.find(5).subject}/,
+ }
+ }
+ }
end
- def test_global_activity_logged_user
- @request.session[:user_id] = 2 # manager
- get :activity
- assert_response :success
- assert_template 'activity'
- assert_not_nil assigns(:events)
-
- assert assigns(:events).include?(Issue.find(1))
- # Issue of a private project the user belongs to
- assert assigns(:events).include?(Issue.find(4))
- end
-
-
- def test_global_activity_with_all_types
- get :activity, :show_issues => 1, :show_news => 1, :show_files => 1, :show_documents => 1, :show_changesets => 1, :show_wiki_pages => 1, :show_messages => 1
- assert_response :success
- assert_template 'activity'
- assert_not_nil assigns(:events)
-
- assert assigns(:events).include?(Issue.find(1))
- assert !assigns(:events).include?(Issue.find(4))
- assert assigns(:events).include?(Message.find(5))
- end
-
def test_calendar
get :calendar, :id => 1
assert_response :success
diff --git a/test/unit/activity_test.rb b/test/unit/activity_test.rb
new file mode 100644
index 00000000..ccda9f11
--- /dev/null
+++ b/test/unit/activity_test.rb
@@ -0,0 +1,71 @@
+# redMine - project management software
+# 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
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+
+require File.dirname(__FILE__) + '/../test_helper'
+
+class ActivityTest < Test::Unit::TestCase
+ fixtures :projects, :versions, :users, :roles, :members, :issues, :journals, :journal_details,
+ :trackers, :projects_trackers, :issue_statuses, :enabled_modules, :enumerations, :boards, :messages
+
+ def setup
+ @project = Project.find(1)
+ end
+
+ def test_activity_without_subprojects
+ events = find_events(User.anonymous, :project => @project)
+ assert_not_nil events
+
+ assert events.include?(Issue.find(1))
+ assert !events.include?(Issue.find(4))
+ # subproject issue
+ assert !events.include?(Issue.find(5))
+ end
+
+ def test_activity_with_subprojects
+ events = find_events(User.anonymous, :project => @project, :with_subprojects => 1)
+ assert_not_nil events
+
+ assert events.include?(Issue.find(1))
+ # subproject issue
+ assert events.include?(Issue.find(5))
+ end
+
+ def test_global_activity_anonymous
+ events = find_events(User.anonymous)
+ assert_not_nil events
+
+ assert events.include?(Issue.find(1))
+ assert events.include?(Message.find(5))
+ # Issue of a private project
+ assert !events.include?(Issue.find(4))
+ end
+
+ def test_global_activity_logged_user
+ events = find_events(User.find(2)) # manager
+ assert_not_nil events
+
+ assert events.include?(Issue.find(1))
+ # Issue of a private project the user belongs to
+ assert events.include?(Issue.find(4))
+ end
+
+ private
+
+ def find_events(user, options={})
+ Redmine::Activity::Fetcher.new(user, options).events(Date.today - 30, Date.today + 1)
+ end
+end
diff --git a/vendor/plugins/acts_as_activity_provider/init.rb b/vendor/plugins/acts_as_activity_provider/init.rb
new file mode 100644
index 00000000..5bf05da2
--- /dev/null
+++ b/vendor/plugins/acts_as_activity_provider/init.rb
@@ -0,0 +1,2 @@
+require File.dirname(__FILE__) + '/lib/acts_as_activity_provider'
+ActiveRecord::Base.send(:include, Redmine::Acts::ActivityProvider)
diff --git a/vendor/plugins/acts_as_activity_provider/lib/acts_as_activity_provider.rb b/vendor/plugins/acts_as_activity_provider/lib/acts_as_activity_provider.rb
new file mode 100644
index 00000000..7c4fac8b
--- /dev/null
+++ b/vendor/plugins/acts_as_activity_provider/lib/acts_as_activity_provider.rb
@@ -0,0 +1,68 @@
+# redMine - project management software
+# 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
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+
+module Redmine
+ module Acts
+ module ActivityProvider
+ def self.included(base)
+ base.extend ClassMethods
+ end
+
+ module ClassMethods
+ def acts_as_activity_provider(options = {})
+ unless self.included_modules.include?(Redmine::Acts::ActivityProvider::InstanceMethods)
+ cattr_accessor :activity_provider_options
+ send :include, Redmine::Acts::ActivityProvider::InstanceMethods
+ end
+
+ options.assert_valid_keys(:type, :permission, :timestamp, :find_options)
+ self.activity_provider_options ||= {}
+
+ # One model can provide different event types
+ # We store these options in activity_provider_options hash
+ event_type = options.delete(:type) || self.name.underscore.pluralize
+
+ options[:permission] = "view_#{self.name.underscore.pluralize}".to_sym unless options.has_key?(:permission)
+ options[:timestamp] ||= "#{table_name}.created_on"
+ options[:find_options] ||= {}
+ self.activity_provider_options[event_type] = options
+ end
+ end
+
+ module InstanceMethods
+ def self.included(base)
+ base.extend ClassMethods
+ end
+
+ module ClassMethods
+ # Returns events of type event_type visible by user that occured between from and to
+ def find_events(event_type, user, from, to, options)
+ 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])
+ cond.add(Project.allowed_to_condition(user, provider_options[:permission], options)) if provider_options[:permission]
+
+ with_scope(:find => { :conditions => cond.conditions }) do
+ find(:all, provider_options[:find_options])
+ end
+ end
+ end
+ end
+ end
+ end
+end