diff options
Diffstat (limited to 'app/models')
| -rw-r--r-- | app/models/role.rb | 5 | ||||
| -rw-r--r-- | app/models/wiki_content.rb | 4 |
2 files changed, 7 insertions, 2 deletions
diff --git a/app/models/role.rb b/app/models/role.rb index 5ff9470f9..beb13c03b 100644 --- a/app/models/role.rb +++ b/app/models/role.rb @@ -76,6 +76,11 @@ class Role < ActiveRecord::Base save! end + # Returns true if the role has the given permission + def has_permission?(perm) + !permissions.nil? && permissions.include?(perm.to_sym) + end + def <=>(role) position <=> role.position end diff --git a/app/models/wiki_content.rb b/app/models/wiki_content.rb index f2ee39c4d..4a4c5c270 100644 --- a/app/models/wiki_content.rb +++ b/app/models/wiki_content.rb @@ -35,9 +35,9 @@ class WikiContent < ActiveRecord::Base :type => 'wiki-page', :url => Proc.new {|o| {:controller => 'wiki', :id => o.page.wiki.project_id, :page => o.page.title, :version => o.version}} - acts_as_activity_provider :type => 'wiki_pages', + acts_as_activity_provider :type => 'wiki_edits', :timestamp => "#{WikiContent.versioned_table_name}.updated_on", - :permission => :view_wiki_pages, + :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, " + "#{WikiContent.versioned_table_name}.page_id, #{WikiContent.versioned_table_name}.author_id, " + |