Changed the Timelogs to use both the Systemwide and Project specific TimeEntryActivities

* Added Project#activities to return all the Systemwide and Project specific
  activities, excluding Systemwide ones that are overridden.
* Added some tests for TimelogHelper.

  #4077

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2948 e93f8b46-1217-0410-a6f0-8f06a7374b81

app/helpers/timelog_helper.rb

@@ -29,10 +29,16 @@ module TimelogHelper
   # Returns a collection of activities for a select field.  time_entry
   # is optional and will be used to check if the selected TimeEntryActivity
   # is active.
-  def activity_collection_for_select_options(time_entry=nil)
-    activities = TimeEntryActivity.active
+  def activity_collection_for_select_options(time_entry=nil, project=nil)
+    project ||= @project
+    if project.nil?
+      activities = TimeEntryActivity.active
+    else
+      activities = project.activities
+    end
+
     collection = []
-    if time_entry && !time_entry.activity.active?
+    if time_entry && time_entry.activity && !time_entry.activity.active?
       collection << [ "--- #{l(:actionview_instancetag_blank_option)} ---", '' ]
     else
       collection << [ "--- #{l(:actionview_instancetag_blank_option)} ---", '' ] unless activities.detect(&:is_default)