Download as
Browse Code »

Commit 05e9e3b51b8b527aa0fcd7217481b0eb1ce6c6f2

Authored by Victor Costa
1 parent 16d42087
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 breadcrumbs plugin

Showing 4 changed files with 9 additions and 7 deletions   Show diff stats
plugins/breadcrumbs/lib/breadcrumbs_plugin/content_breadcrumbs_block.rb
  Diff comments   View file @05e9e3b
@@ -3,6 +3,8 @@ class BreadcrumbsPlugin::ContentBreadcrumbsBlock < Block @@ -3,6 +3,8 @@ class BreadcrumbsPlugin::ContentBreadcrumbsBlock < Block
3 settings_items :show_cms_action, :type => :boolean, :default => true 3 settings_items :show_cms_action, :type => :boolean, :default => true
4 settings_items :show_profile, :type => :boolean, :default => true 4 settings_items :show_profile, :type => :boolean, :default => true
5 5
  6 + attr_accessible :show_cms_action, :show_profile
  7 +
6 def self.description 8 def self.description
7 _('Content Breadcrumbs') 9 _('Content Breadcrumbs')
8 end 10 end
@@ -35,7 +37,7 @@ class BreadcrumbsPlugin::ContentBreadcrumbsBlock < Block @@ -35,7 +37,7 @@ class BreadcrumbsPlugin::ContentBreadcrumbsBlock < Block
35 37
36 def content(args={}) 38 def content(args={})
37 block = self 39 block = self
38 - lambda do 40 + proc do
39 trail = block.trail(@page, @profile, params) 41 trail = block.trail(@page, @profile, params)
40 if !trail.empty? 42 if !trail.empty?
41 trail.map { |t| link_to(t[:name], t[:url], :class => 'item') }.join(content_tag('span', ' > ', :class => 'separator')) 43 trail.map { |t| link_to(t[:name], t[:url], :class => 'item') }.join(content_tag('span', ' > ', :class => 'separator'))
plugins/breadcrumbs/test/functional/profile_design_controller_test.rb
  Diff comments   View file @05e9e3b
@@ -17,8 +17,8 @@ class ProfileDesignControllerTest < ActionController::TestCase @@ -17,8 +17,8 @@ class ProfileDesignControllerTest < ActionController::TestCase
17 @profile = fast_create(Community, :environment_id => @environment.id) 17 @profile = fast_create(Community, :environment_id => @environment.id)
18 @page = fast_create(Folder, :profile_id => @profile.id) 18 @page = fast_create(Folder, :profile_id => @profile.id)
19 19
20 - box = Box.create!(:owner => @profile)  
21 - @block = BreadcrumbsPlugin::ContentBreadcrumbsBlock.create!(:box => box) 20 + box = create(Box, :owner => @profile)
  21 + @block = create(BreadcrumbsPlugin::ContentBreadcrumbsBlock, :box => box)
22 22
23 user = create_user('testinguser') 23 user = create_user('testinguser')
24 @profile.add_admin(user.person) 24 @profile.add_admin(user.person)
plugins/breadcrumbs/views/box_organizer/breadcrumbs_plugin/_content_breadcrumbs_block.html.erb 0 → 100644
  Diff comments   View file @05e9e3b
@@ -0,0 +1,4 @@ @@ -0,0 +1,4 @@
  1 +<div id='edit-breadcrumbs-block'>
  2 + <%= labelled_form_field check_box(:block, :show_cms_action) + _('Show cms action'), '' %>
  3 + <%= labelled_form_field check_box(:block, :show_profile) + _('Show profile'), '' %>
  4 +</div>
plugins/breadcrumbs/views/box_organizer/breadcrumbs_plugin/_content_breadcrumbs_block.rhtml
View file @16d4208
@@ -1,4 +0,0 @@ @@ -1,4 +0,0 @@
1 -<div id='edit-breadcrumbs-block'>  
2 - <%= labelled_form_field check_box(:block, :show_cms_action) + _('Show cms action'), '' %>  
3 - <%= labelled_form_field check_box(:block, :show_profile) + _('Show profile'), '' %>  
4 -</div>