Download as
Browse Code »

Commit 9c672bcf92fec622a141554f709e21e94f0e0bfe

Authored by Victor Costa
1 parent 4f417add
Exists in master and in 29 other branches add_member_task_reject_details, admin_visible_profile, article-list-template, community_notifications, contact_admin_translation, event_fixes, fix_comments_pagination, fix_rails4_organization_ratings, fix_sign_up_form, follow_step_fix, forum_topic_creation, mirror_block_improvements, multi_env_on_remote_user, new_security, noosfero_spb_ci, organization_ratings_improvements, organization_ratings_link_to_profile_stable-spb-1.3, organization_ratings_translations_fix, profile_api_improvements, ratings_minor_fixes, remote_user_fix, send_email_to_admins, stable-spb-1.3, stable-spb-1.3-fixes, stable-spb-1.4, stable-spb-1.5, suggest_rejected_value, web_steps_improvements, xss_terminate_custom_options

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 26 include ActionView::Helpers::TagHelper
27 27 def to_html(options = {})
28 28 me = self
29   - lambda do
  29 + proc do
30 30 render :file => 'content_viewer/blog_page', :locals => { :blog=>me, :inside_block=>options[:inside_block] }
31 31 end
32 32 end
... ...
vendor/plugins/access_control/lib/acts_as_accessor.rb
  Diff comments   View file @9c672bc
... ... @@ -2,6 +2,7 @@ class ActiveRecord::Base
2 2 def self.acts_as_accessor
3 3 has_many :role_assignments, :as => :accessor, :dependent => :destroy
4 4  
  5 + public
5 6 def has_permission?(permission, resource = nil)
6 7 return true if resource == self
7 8 role_assignments.includes([:resource,:role]).any? {|ra| ra.has_permission?(permission, resource)}
... ...