meineerde/redmine
1
0
Fork 0
mirror of https://github.com/meineerde/redmine.git synced 2026-03-10 19:23:06 +00:00
Code Issues Releases Wiki Activity

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

Browse Source 
Conflicts:
	db/migrate/20100705164950_change_changes_path_length_limit.rb
This commit is contained in:
Holger Just 2010-07-06 19:28:57 +02:00
commit 75d5ab431f
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
db/migrate/20100705164950_change_changes_path_length_limit.rb
View File

@ -5,7 +5,7 @@ class ChangeChangesPathLengthLimit < ActiveRecord::Migration
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

2
lib/redmine/activity/fetcher.rb
View File

@ -38,7 +38,7 @@ module Redmine
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