Download as
Browse Code »

Commit 9c672bcf92fec622a141554f709e21e94f0e0bfe

Authored by Victor Costa
1 parent 4f417add
Exists in master and in 27 other branches 1.2+SPB2, 2_split_by_role, add_fields_in_api, api_fixies, api_pagination, api_private_token, api_tasks, article_hit_count, blog_page_bug, checkbox_to_user_can_edit_page, communities_ratings, communities_ratings_moderation, community_ratings_rebase, fix_cloned_article_parent, fix_gallery_image_url, fix_javascript_categories, fix_optional_fields, fix_suggest_article, fix_user_email_validation, highlight_block_fix, notification_plugin, notification_plugin_rebase, script_to_update, split_by_role, temp_ratings, tests, tests_fixies

rails3: fix blog

Showing 2 changed files with 2 additions and 1 deletions   Show diff stats
app/models/blog.rb
  Diff comments   View file @9c672bc
@@ -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
  Diff comments   View file @9c672bc
@@ -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)}