Merge branch 'master' of git://github.com/edavis10/redmine

Conflicts: db/migrate/20100705164950_change_changes_path_length_limit.rb
meineerde · Jul 6, 2010 · 75d5ab4 · 75d5ab4
2 parents 5ed4b76 + ad73f12
commit 75d5ab4
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/db/migrate/20100705164950_change_changes_path_length_limit.rb b/db/migrate/20100705164950_change_changes_path_length_limit.rb
@@ -5,7 +5,7 @@ def self.up
   end
 
   def self.down
-    change_column :changes, :from_path, :string, :default => "", :null => false
+    change_column :changes, :path, :string, :default => "", :null => false
     change_column :changes, :from_path, :string
   end
 end
diff --git a/lib/redmine/activity/fetcher.rb b/lib/redmine/activity/fetcher.rb
@@ -38,7 +38,7 @@ 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 = @event_types.select {|o| @project.self_and_descendants.detect {|p| @user.allowed_to?("view_#{o}".to_sym, p)}} if @project
         @event_types
       end