diff --git a/app/models/blog.rb b/app/models/blog.rb index c22acf8..72b1fe3 100644 --- a/app/models/blog.rb +++ b/app/models/blog.rb @@ -26,7 +26,7 @@ class Blog < Folder include ActionView::Helpers::TagHelper def to_html(options = {}) me = self - lambda do + proc do render :file => 'content_viewer/blog_page', :locals => { :blog=>me, :inside_block=>options[:inside_block] } end end diff --git a/vendor/plugins/access_control/lib/acts_as_accessor.rb b/vendor/plugins/access_control/lib/acts_as_accessor.rb index e6b5667..451a198 100644 --- a/vendor/plugins/access_control/lib/acts_as_accessor.rb +++ b/vendor/plugins/access_control/lib/acts_as_accessor.rb @@ -2,6 +2,7 @@ class ActiveRecord::Base def self.acts_as_accessor has_many :role_assignments, :as => :accessor, :dependent => :destroy + public def has_permission?(permission, resource = nil) return true if resource == self role_assignments.includes([:resource,:role]).any? {|ra| ra.has_permission?(permission, resource)} -- libgit2 0.21.2