Commit 9c672bcf92fec622a141554f709e21e94f0e0bfe
1 parent
4f417add
Exists in
master
and in
22 other branches
rails3: fix blog
Showing
2 changed files
with
2 additions
and
1 deletions
Show diff stats
app/models/blog.rb
@@ -26,7 +26,7 @@ class Blog < Folder | @@ -26,7 +26,7 @@ class Blog < Folder | ||
26 | include ActionView::Helpers::TagHelper | 26 | include ActionView::Helpers::TagHelper |
27 | def to_html(options = {}) | 27 | def to_html(options = {}) |
28 | me = self | 28 | me = self |
29 | - lambda do | 29 | + proc do |
30 | render :file => 'content_viewer/blog_page', :locals => { :blog=>me, :inside_block=>options[:inside_block] } | 30 | render :file => 'content_viewer/blog_page', :locals => { :blog=>me, :inside_block=>options[:inside_block] } |
31 | end | 31 | end |
32 | end | 32 | end |
vendor/plugins/access_control/lib/acts_as_accessor.rb
@@ -2,6 +2,7 @@ class ActiveRecord::Base | @@ -2,6 +2,7 @@ class ActiveRecord::Base | ||
2 | def self.acts_as_accessor | 2 | def self.acts_as_accessor |
3 | has_many :role_assignments, :as => :accessor, :dependent => :destroy | 3 | has_many :role_assignments, :as => :accessor, :dependent => :destroy |
4 | 4 | ||
5 | + public | ||
5 | def has_permission?(permission, resource = nil) | 6 | def has_permission?(permission, resource = nil) |
6 | return true if resource == self | 7 | return true if resource == self |
7 | role_assignments.includes([:resource,:role]).any? {|ra| ra.has_permission?(permission, resource)} | 8 | role_assignments.includes([:resource,:role]).any? {|ra| ra.has_permission?(permission, resource)} |